Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms

Browse Source
This commit is contained in:
holan20180123
2021-06-18 14:54:46 +08:00
parent caccf6b229 4c792a2318
commit ff1360bcda
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/view/meetingblock.html.php
+3 -3
View File
@@ -4,7 +4,7 @@
<style>
.block-meetings .c-id {width: 50px;}
.block-meetings .c-date {width: 100px;}
.block-meetings .c-dept {width: 80px;}
.block-meetings .c-dept {width: 80px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
.block-meetings .c-mode {width: 80px;}
.block-meetings .c-minutedBy {width: 80px;}
.block-meetings .c-host {width: 80px;}
@@ -34,8 +34,8 @@
<td class='c-date'><?php echo $meeting->date == '0000-00-00' ? '' : $meeting->date;?></td>
<td class='c-name' title='<?php echo $meeting->name?>'><?php echo html::a($this->createLink('meeting', 'view', "meetingID=$meeting->id"), $meeting->name, '', "data-app='my'")?></td>
<?php if($longBlock):?>
<td class='c-dept'><?php echo zget($depts, $meeting->dept)?></td>
<td class='c-mode'><?php echo zget($lang->meeting->modeList, $meeting->dept)?></td>
<td class='c-dept' title="<?php echo zget($depts, $meeting->dept)?>"><?php echo zget($depts, $meeting->dept)?></td>
<td class='c-mode'><?php echo zget($lang->meeting->modeList, $meeting->mode)?></td>
<td class='c-minutedBy'><?php echo zget($users, $meeting->minutedBy);?></td>
<?php endif;?>
<td class='c-host'><?php echo zget($users, $meeting->host);?></td>
module/block/view/todoblock.html.php
+2 -1
View File
@@ -22,6 +22,7 @@ if(!$selfCall) die(include('./todolist.html.php'));
.block-todoes .todoes > li {position: relative; padding: 5px 10px 5px 35px; list-style: none; white-space:nowrap; overflow: auto; overflow-x:hidden;}
.block-todoes .todoes > li:hover {background-color: #e9f2fb;}
.block-todoes .todo-title {padding: 5px 15px 5px 5px;}
.titleBox {width: 700px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; display: block;}
.block-todoes .todo-pri {margin: 0 5px;}
.block-todoes .todo-time {display: inline-block; padding: 0 5px; font-size: 12px; color: #8e939a; width: 95px;}
.block-todoes .todo-check {position: absolute; top: 5px; left: 10px; display: block; width: 20px; height: 20px; font-size: 20px; color: transparent; cursor: pointer; background: #fff; border: 2px solid #eee; border-radius: 50%;}
@@ -94,7 +95,7 @@ if(!$selfCall) die(include('./todolist.html.php'));
$appid = isset($_GET['entry']) ? "class='app-btn' data-id='{$this->get->entry}'" : '';
$viewLink = $this->createLink('todo', 'view', "todoID={$todo->id}&from=my", 'html', true);
?>
<li data-id='<?php echo $todo->id?>'>
<li data-id='<?php echo $todo->id?>' class='titleBox'>
<span class="todo-check icon icon-check-circle"></span>
<a href="<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink);?>" class='iframe' data-toggle='modal' <?php echo $appid?>>
<?php if ($todo->date == '2030-01-01') :?>
module/webhook/model.php
+9 -2
View File
@@ -380,7 +380,7 @@ class webhookModel extends model
$intersect = array_intersect($webhookProducts, $actionProduct);
if(!$intersect) return false;
}
if($webhook->executions)
if(isset($webhook->executions))
{
if(strpos(",$webhook->executions,", ",$action->execution,") === false) return false;
}
@@ -447,13 +447,20 @@ class webhookModel extends model
public function getViewLink($objectType, $objectID)
{
$oldOnlyBody = '';
$openApp = '';
if(isset($_GET['onlybody']) and $_GET['onlybody'] == 'yes')
{
$oldOnlyBody = 'yes';
unset($_GET['onlybody']);
}
if($objectType == 'case') $objectType = 'testcase';
$viewLink = helper::createLink($objectType, 'view', "id=$objectID", 'html');
if($objectType == 'meeting')
{
$meeting = $this->dao->findById($objectID)->from(TABLE_MEETING)->fetch();
$openApp = $meeting->project ? '#app=project' : '#app=my';
}
$viewLink = helper::createLink($objectType, 'view', "id=$objectID", 'html') . $openApp;
if($oldOnlyBody) $_GET['onlybody'] = $oldOnlyBody;
return $viewLink;