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

*Finish task #64879.

Browse Source
This commit is contained in:
liuhong
2022-08-18 02:51:35 +00:00
parent 6b6f9c39ee
commit 3fcef9c093
5 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extension/lite/my/ext/view/task.html.php
+2 -1
View File
@@ -95,7 +95,8 @@
}
else
{
echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', '', $task->project), $task->name, null, "style='color: $task->color'");
$task->executionType == 'kanban' ? ($class = 'iframe').($onlybody = true) : ($class = '').($onlybody = '');
echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', "{$onlybody}", $task->project), $task->name, null,"class={$class} style='color: $task->color'");
}
?>
<?php if(!empty($task->children)) echo '<a class="task-toggle" data-id="' . $task->id . '"><i class="icon icon-angle-double-right"></i></a>';?>
module/block/view/taskblock.html.php
+2 -2
View File
@@ -44,8 +44,8 @@
<tr>
<td class='c-id-xs'><?php echo sprintf('%03d', $task->id);?></td>
<td class='c-pri <?php if($longBlock) echo "c-pri-long"?>'><span class='label-pri label-pri-<?php echo $task->pri;?>' title='<?php echo zget($lang->task->priList, $task->pri, $task->pri)?>'><?php echo zget($lang->task->priList, $task->pri, $task->pri)?></span></td>
<?php $task->executionType == 'kanban' ? ($class = 'iframe').($onlybody = 'onlybody=yes') : ($class = '').($onlybody = '');?>
<td class='c-name' style='color: <?php echo $task->color?>' title='<?php echo $task->name?>'><?php echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', "{$onlybody}", $task->project), $task->name, null,"class={$class}")?></td>
<?php $task->executionType == 'kanban' ? ($class = 'iframe').($onlybody = true) : ($class = '').($onlybody = '');?>
<td class='c-name' style='color: <?php echo $task->color?>' title='<?php echo $task->name?>'><?php echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', "{$onlybody}", $task->project), $task->name, null, "class={$class} data-toggle='modal'")?></td>
<?php if($longBlock):?>
<td class='c-estimate text-center' title="<?php echo $task->estimate . ' ' . $lang->execution->workHour;?>"><?php echo $task->estimate . $lang->execution->workHourUnit;?></td>
<td class='c-deadline'><?php if(substr($task->deadline, 0, 4) > 0) echo $task->deadline;?></td>
module/my/view/task.html.php
+1 -1
View File
@@ -108,7 +108,7 @@
}
else
{
$task->executionType == 'kanban' ? ($class = 'iframe').($onlybody = 'onlybody=yes') : ($class = '').($onlybody = '');
$task->executionType == 'kanban' ? ($class = 'iframe').($onlybody = true) : ($class = '').($onlybody = '');
echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', "{$onlybody}", $task->project), $task->name, null,"class={$class} style='color: $task->color'");
}
?>
module/task/model.php
+5 -5
View File
@@ -3456,7 +3456,7 @@ class taskModel extends model
$storyChanged = (!empty($task->storyStatus) and $task->storyStatus == 'active' and $task->latestStoryVersion > $task->storyVersion and !in_array($task->status, array('cancel', 'closed')));
$canView = common::hasPriv('task', 'view');
$taskLink = helper::createLink('task', 'view', "taskID=$task->id");
$taskLink = helper::createLink('task', 'view', "taskID=$task->id", '', true);
$account = $this->app->user->account;
$id = $col->id;
if($col->show)
@@ -3475,7 +3475,7 @@ class taskModel extends model
if($id == 'name')
{
$title = " title='{$task->name}'";
if(!empty($task->children)) $class .= ' has-child';
if(!empty($task->children)) $class .= 'has-child';
}
if($id == 'story') $title = " title='{$task->storyTitle}'";
if($id == 'estimate' || $id == 'consumed' || $id == 'left')
@@ -3514,7 +3514,7 @@ class taskModel extends model
if($task->module and isset($modulePairs[$task->module])) echo "<span class='label label-gray label-badge'>" . $modulePairs[$task->module] . '</span> ';
if($task->parent > 0) echo '<span class="label label-badge label-light" title="' . $this->lang->task->children . '">' . $this->lang->task->childrenAB . '</span> ';
if(!empty($task->team)) echo '<span class="label label-badge label-light" title="' . $this->lang->task->multiple . '">' . $this->lang->task->multipleAB . '</span> ';
echo $canView ? html::a($taskLink, $task->name, null, "style='color: $task->color' title='$task->name'") : "<span style='color: $task->color'>$task->name</span>";
echo $canView ? html::a($taskLink, $task->name, null, "style='color: $task->color' title='$task->name' class='iframe'") : "<span style='color: $task->color'>$task->name</span>";
if(!empty($task->children)) echo '<a class="task-toggle" data-id="' . $task->id . '"><i class="icon icon-angle-double-right"></i></a>';
if($task->fromBug) echo html::a(helper::createLink('bug', 'view', "id=$task->fromBug"), "[BUG#$task->fromBug]", '', "class='bug'");
break;
@@ -3947,9 +3947,9 @@ class taskModel extends model
{
$this->updateExecutionEsDateByGantt($objectID, $objectType, $post);
}
if(dao::isError()) return false;
$newObject = $this->dao->select('*')->from($changeTable)->where('id')->eq($objectID)->fetch();
$changes = common::createChanges($oldObject, $newObject);
$actionID = $this->loadModel('action')->create($actionType, $objectID, 'edited');
module/user/view/task.html.php
+1 -1
View File
@@ -61,7 +61,7 @@
<td class='text-left nobr'>
<?php if(!empty($task->team)) echo '<span class="label label-badge label-light">' . $this->lang->task->multipleAB . '</span> ';?>
<?php if($task->parent > 0) echo '<span class="label label-badge label-light">' . $this->lang->task->childrenAB . '</span> ';?>
<?php $task->executionType == 'kanban' ? ($class = 'iframe').($onlybody = 'onlybody=yes') : ($class = '').($onlybody = '');?>
<?php $task->executionType == 'kanban' ? ($class = 'iframe').($onlybody = true) : ($class = '').($onlybody = '');?>
<?php echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', "{$onlybody}", $task->project), $task->name, null,"class={$class} style='color: $task->color'");?>
</td>
<td class='hours' title="<?php echo $task->estimate . ' ' . $lang->execution->workHour;?>"><?php echo $task->estimate . $lang->execution->workHourUnit;?></td>