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

* Finish task #4782.

Browse Source
This commit is contained in:
Yagami
2018-09-12 13:53:08 +08:00
parent c6ce4c9e39
commit 976b7770fc
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/task/model.php
View File

@@ -2406,12 +2406,12 @@ class taskModel extends model
echo "</span>";
break;
case 'name':
if(!empty($task->children)) echo '<a class="task-toggle" data-id="' . $task->id . '"><i class="icon icon-caret-down"></i></a>';
if(!empty($task->product) && isset($branchGroups[$task->product][$task->branch])) echo "<span class='label label-info label-badge'>" . $branchGroups[$task->product][$task->branch] . '</span> ';
if(empty($task->children) and $task->module and isset($modulePairs[$task->module])) echo "<span class='label label-info label-badge'>" . $modulePairs[$task->module] . '</span> ';
if($child or !empty($task->parent)) echo '<span class="label label-badge label-light">' . $this->lang->task->childrenAB . '</span> ';
if(!empty($task->team)) echo '<span class="label label-badge label-light">' . $this->lang->task->multipleAB . '</span> ';
echo $canView ? html::a($taskLink, $task->name, null, "style='color: $task->color'") : "<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-caret-down"></i></a>';
if($task->fromBug) echo html::a(helper::createLink('bug', 'view', "id=$task->fromBug"), "[BUG#$task->fromBug]", '_blank', "class='bug'");
break;
case 'type':

3
www/theme/default/style.css
View File

@@ -17,8 +17,5 @@
.tree li.active>a{background-color:#fff}
.tree li>a:hover{background-color:#fff}
.detail-content{padding: 5px 0 0 0px;}
<<<<<<< HEAD
#sidebar>.sidebar-toggle>.icon{color:#2196f3}
=======
.body-modal .main-header>h2{font-weight:bold;}
>>>>>>> c4e473df148639a9cb9f22676ae4a9bdc6e640ac