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

Merge branch 'sprint/185_fixbug_19999' into 'sprint/185'

Browse Source 
* Fixbug 19999.

See merge request easycorp/zentaopms!1953
This commit is contained in:
李玉春
2022-02-24 06:53:32 +00:00
parent d620a49720 8d34b3ef8b
commit 140fce609f
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/kanban/model.php
+1 -1
View File
@@ -3467,7 +3467,7 @@ class kanbanModel extends model
$menu = array();
if(common::hasPriv('task', 'edit') and $this->task->isClickable($task, 'edit')) $menu[] = array('label' => $this->lang->task->edit, 'icon' => 'edit', 'url' => helper::createLink('task', 'edit', "taskID=$task->id", '', true), 'size' => '95%');
if(common::hasPriv('task', 'pause') and $this->task->isClickable($task, 'pause')) $menu[] = array('label' => $this->lang->task->pause, 'icon' => 'ok', 'url' => helper::createLink('task', 'pause', "taskID=$task->id", '', true));
if(common::hasPriv('task', 'pause') and $this->task->isClickable($task, 'pause')) $menu[] = array('label' => $this->lang->task->pause, 'icon' => 'pause', 'url' => helper::createLink('task', 'pause', "taskID=$task->id", '', true));
if(common::hasPriv('task', 'restart') and $this->task->isClickable($task, 'restart')) $menu[] = array('label' => $this->lang->task->restart, 'icon' => 'play', 'url' => helper::createLink('task', 'restart', "taskID=$task->id", '', true));
if(common::hasPriv('task', 'recordEstimate') and $this->task->isClickable($task, 'recordEstimate')) $menu[] = array('label' => $this->lang->task->recordEstimate, 'icon' => 'time', 'url' => helper::createLink('task', 'recordEstimate', "taskID=$task->id", '', true));
if(common::hasPriv('task', 'activate') and $this->task->isClickable($task, 'activate')) $menu[] = array('label' => $this->lang->task->activate, 'icon' => 'magic', 'url' => helper::createLink('task', 'activate', "taskID=$task->id", '', true));
module/task/view/view.html.php
+12 -1
View File
@@ -214,7 +214,18 @@
if($this->config->vision == 'lite') $method = 'kanban';
?>
<th class='w-90px'><?php echo $lang->task->execution;?></th>
<td><?php if(!common::printLink('execution', $method, "executionID=$task->execution", $execution->name)) echo $execution->name;?></td>
<td>
<?php
if($execution->type != 'kanban')
{
common::printLink('execution', $method, "executionID={$task->execution}", $execution->name);
}
else
{
echo $execution->name;
}
?>
</td>
</tr>
<tr>
<th><?php echo $lang->task->module;?></th>