From a8bdc9bc6ceab9815e4e6fb4e24290d511418dae Mon Sep 17 00:00:00 2001 From: tianshujie Date: Thu, 22 Sep 2022 09:07:11 +0800 Subject: [PATCH 1/4] * Finish task #70008. --- module/bug/model.php | 5 +++-- module/design/model.php | 5 +++-- module/story/model.php | 6 ++++-- module/task/model.php | 5 +++-- module/testtask/model.php | 5 ++++- 5 files changed, 17 insertions(+), 9 deletions(-) diff --git a/module/bug/model.php b/module/bug/model.php index 029d351d5f..91fe83521d 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -3486,8 +3486,9 @@ class bugModel extends model { $btnTextClass = ''; $assignedToText = !empty($bug->assignedTo) ? zget($users, $bug->assignedTo) : $this->lang->bug->noAssigned; - $btnTextClass = 'text-primary'; - if($bug->assignedTo == $this->app->user->account) $btnTextClass = 'text-red'; + if(empty($bug->assignedTo)) $btnTextClass = 'assigned'; + if($bug->assignedTo == $this->app->user->account) $btnTextClass = 'assigned-current'; + if(empty($bug->assignedTo) and $bug->assignedTo != $this->app->user->account) $btnTextClass = 'assigned-other'; $btnClass = $bug->assignedTo == 'closed' ? ' disabled' : ''; $btnClass = "iframe btn btn-icon-left btn-sm {$btnClass}"; diff --git a/module/design/model.php b/module/design/model.php index 25be18689e..6440779cb6 100644 --- a/module/design/model.php +++ b/module/design/model.php @@ -471,10 +471,11 @@ class designModel extends model if(empty($design->assignedTo)) { - $btnTextClass = 'text-primary'; + $btnTextClass = 'assigned'; $assignedToText = $this->lang->design->noAssigned; } - if($design->assignedTo == $this->app->user->account) $btnTextClass = 'text-red'; + if($design->assignedTo == $this->app->user->account) $btnTextClass = 'assigned-current'; + if(empty($design->assignedTo) and $design->assignedTo != $this->app->user->account) $btnTextClass = 'assigned-other'; $btnClass = $design->assignedTo == 'closed' ? ' disabled' : ''; $btnClass = "iframe btn btn-icon-left btn-sm {$btnClass}"; diff --git a/module/story/model.php b/module/story/model.php index da1161f4a3..3efc178609 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -4911,10 +4911,12 @@ class storyModel extends model if(empty($story->assignedTo)) { - $btnTextClass = 'text-primary'; + $btnTextClass = 'assigned'; $assignedToText = $this->lang->task->noAssigned; } - if($story->assignedTo == $this->app->user->account) $btnTextClass = 'text-red'; + + if($story->assignedTo == $this->app->user->account) $btnTextClass = 'assigned-current'; + if(!empty($story->assignedTo) and $story->assignedTo != $this->app->user->account) $btnTextClass = 'assigned-other'; $btnClass = $story->assignedTo == 'closed' ? ' disabled' : ''; $btnClass = "iframe btn btn-icon-left btn-sm {$btnClass}"; diff --git a/module/task/model.php b/module/task/model.php index 301f650360..4d0cee263e 100755 --- a/module/task/model.php +++ b/module/task/model.php @@ -3867,10 +3867,11 @@ class taskModel extends model } elseif(empty($task->assignedTo)) { - $btnTextClass = 'text-primary'; + $btnTextClass = 'assigned'; $assignedToText = $this->lang->task->noAssigned; } - if($task->assignedTo == $this->app->user->account) $btnTextClass = 'text-red'; + if($task->assignedTo == $this->app->user->account) $btnTextClass = 'assigned-current'; + if(empty($task->assignedTo) and $task->assignedTo != $this->app->user->account) $btnTextClass = 'assigned-other'; $btnClass = $task->assignedTo == 'closed' ? ' disabled' : ''; $btnClass = "iframe btn btn-icon-left btn-sm {$btnClass}"; diff --git a/module/testtask/model.php b/module/testtask/model.php index 7468f426b1..e8b5869cec 100755 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -1602,7 +1602,10 @@ class testtaskModel extends model if($run->story and $run->storyTitle) echo html::a(helper::createLink('story', 'view', "storyID=$run->story"), $run->storyTitle); break; case 'assignedTo': - echo zget($users, $run->assignedTo); + $btnTextClass = ''; + if($run->assignedTo == $this->app->user->account) $btnTextClass = 'assigned-current'; + if(!empty($run->assignedTo) and $run->assignedTo != $this->app->user->account) $btnTextClass = 'assigned-other'; + echo "" . zget($users, $run->assignedTo) . ''; break; case 'bugs': echo (common::hasPriv('testcase', 'bugs') and $run->bugs) ? html::a(helper::createLink('testcase', 'bugs', "runID={$run->id}&caseID={$run->case}"), $run->bugs, '', "class='iframe'") : $run->bugs; From 073c3fc987d3195595c4965a3e37d6dcbed2460b Mon Sep 17 00:00:00 2001 From: tianshujie Date: Thu, 22 Sep 2022 10:27:55 +0800 Subject: [PATCH 2/4] * Finish task #70008. --- module/bug/model.php | 11 ++++++----- module/design/model.php | 11 ++++++----- module/story/model.php | 13 +++++++------ module/task/model.php | 11 ++++++----- 4 files changed, 25 insertions(+), 21 deletions(-) diff --git a/module/bug/model.php b/module/bug/model.php index 91fe83521d..120a8bff05 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -3485,16 +3485,17 @@ class bugModel extends model public function printAssignedHtml($bug, $users) { $btnTextClass = ''; + $btnClass = ''; $assignedToText = !empty($bug->assignedTo) ? zget($users, $bug->assignedTo) : $this->lang->bug->noAssigned; - if(empty($bug->assignedTo)) $btnTextClass = 'assigned'; - if($bug->assignedTo == $this->app->user->account) $btnTextClass = 'assigned-current'; - if(empty($bug->assignedTo) and $bug->assignedTo != $this->app->user->account) $btnTextClass = 'assigned-other'; + if(empty($bug->assignedTo)) $btnClass = $btnTextClass = 'assigned-none'; + if($bug->assignedTo == $this->app->user->account) $btnClass = $btnTextClass = 'assigned-current'; + if(!empty($bug->assignedTo) and $bug->assignedTo != $this->app->user->account) $btnClass = $btnTextClass = 'assigned-other'; - $btnClass = $bug->assignedTo == 'closed' ? ' disabled' : ''; + $btnClass .= $bug->assignedTo == 'closed' ? ' disabled' : ''; $btnClass = "iframe btn btn-icon-left btn-sm {$btnClass}"; $assignToLink = helper::createLink('bug', 'assignTo', "bugID=$bug->id", '', true); - $assignToHtml = html::a($assignToLink, " {$assignedToText}", '', "class='$btnClass'"); + $assignToHtml = html::a($assignToLink, " {$assignedToText}", '', "class='$btnClass'"); echo !common::hasPriv('bug', 'assignTo', $bug) ? "{$assignedToText}" : $assignToHtml; } diff --git a/module/design/model.php b/module/design/model.php index 6440779cb6..95fa962721 100644 --- a/module/design/model.php +++ b/module/design/model.php @@ -467,20 +467,21 @@ class designModel extends model public function printAssignedHtml($design = '', $users = '') { $btnTextClass = ''; + $btnClass = ''; $assignedToText = zget($users, $design->assignedTo); if(empty($design->assignedTo)) { - $btnTextClass = 'assigned'; + $btnClass = $btnTextClass = 'assigned-none'; $assignedToText = $this->lang->design->noAssigned; } - if($design->assignedTo == $this->app->user->account) $btnTextClass = 'assigned-current'; - if(empty($design->assignedTo) and $design->assignedTo != $this->app->user->account) $btnTextClass = 'assigned-other'; + if($design->assignedTo == $this->app->user->account) $btnClass = $btnTextClass = 'assigned-current'; + if(!empty($design->assignedTo) and $design->assignedTo != $this->app->user->account) $btnClass = $btnTextClass = 'assigned-other'; - $btnClass = $design->assignedTo == 'closed' ? ' disabled' : ''; + $btnClass .= $design->assignedTo == 'closed' ? ' disabled' : ''; $btnClass = "iframe btn btn-icon-left btn-sm {$btnClass}"; $assignToLink = helper::createLink('design', 'assignTo', "designID=$design->id", '', true); - $assignToHtml = html::a($assignToLink, " {$assignedToText}", '', "class='$btnClass'"); + $assignToHtml = html::a($assignToLink, " {$assignedToText}", '', "class='$btnClass'"); echo !common::hasPriv('design', 'assignTo', $design) ? "{$assignedToText}" : $assignToHtml; } diff --git a/module/story/model.php b/module/story/model.php index 3efc178609..829f6bede9 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -4907,23 +4907,24 @@ class storyModel extends model public function printAssignedHtml($story, $users) { $btnTextClass = ''; + $btnClass = ''; $assignedToText = zget($users, $story->assignedTo); if(empty($story->assignedTo)) { - $btnTextClass = 'assigned'; + $btnClass = $btnTextClass = 'assigned-none'; $assignedToText = $this->lang->task->noAssigned; } - if($story->assignedTo == $this->app->user->account) $btnTextClass = 'assigned-current'; - if(!empty($story->assignedTo) and $story->assignedTo != $this->app->user->account) $btnTextClass = 'assigned-other'; + if($story->assignedTo == $this->app->user->account) $btnClass = $btnTextClass = 'assigned-current'; + if(!empty($story->assignedTo) and $story->assignedTo != $this->app->user->account) $btnClass = $btnTextClass = 'assigned-other'; - $btnClass = $story->assignedTo == 'closed' ? ' disabled' : ''; + $btnClass .= $story->assignedTo == 'closed' ? ' disabled' : ''; $btnClass = "iframe btn btn-icon-left btn-sm {$btnClass}"; $assignToLink = helper::createLink('story', 'assignTo', "storyID=$story->id&kanbanGroup=default&from=&storyType=$story->type", '', true); - $assignToHtml = html::a($assignToLink, " {$assignedToText}", '', "class='$btnClass'"); + $assignToHtml = html::a($assignToLink, " {$assignedToText}", '', "class='$btnClass'"); - echo !common::hasPriv($story->type, 'assignTo', $story) ? "{$assignedToText}" : $assignToHtml; + echo !common::hasPriv($story->type, 'assignTo', $story) ? "{$assignedToText}" : $assignToHtml; } /** diff --git a/module/task/model.php b/module/task/model.php index 4d0cee263e..fb543e1236 100755 --- a/module/task/model.php +++ b/module/task/model.php @@ -3846,6 +3846,7 @@ class taskModel extends model public function printAssignedHtml($task, $users) { $btnTextClass = ''; + $btnClass = ''; $assignedToText = $assignedToTitle = zget($users, $task->assignedTo); if(!empty($task->team) and $task->mode == 'multi' and $task->status != 'closed') { @@ -3867,16 +3868,16 @@ class taskModel extends model } elseif(empty($task->assignedTo)) { - $btnTextClass = 'assigned'; + $btnClass = $btnTextClass = 'assigned-none'; $assignedToText = $this->lang->task->noAssigned; } - if($task->assignedTo == $this->app->user->account) $btnTextClass = 'assigned-current'; - if(empty($task->assignedTo) and $task->assignedTo != $this->app->user->account) $btnTextClass = 'assigned-other'; + if($task->assignedTo == $this->app->user->account) $btnClass = $btnTextClass = 'assigned-current'; + if(!empty($task->assignedTo) and $task->assignedTo != $this->app->user->account) $btnClass = $btnTextClass = 'assigned-other'; - $btnClass = $task->assignedTo == 'closed' ? ' disabled' : ''; + $btnClass .= $task->assignedTo == 'closed' ? ' disabled' : ''; $btnClass = "iframe btn btn-icon-left btn-sm {$btnClass}"; $assignToLink = $task->assignedTo == 'closed' ? '#' : helper::createLink('task', 'assignTo', "executionID=$task->execution&taskID=$task->id", '', true); - $assignToHtml = html::a($assignToLink, " {$assignedToText}", '', "class='$btnClass'"); + $assignToHtml = html::a($assignToLink, " {$assignedToText}", '', "class='$btnClass'"); echo !common::hasPriv('task', 'assignTo', $task) ? "{$assignedToText}" : $assignToHtml; } From 6a7c69e14e6b58fac00f14e3cf2378dda526aa0a Mon Sep 17 00:00:00 2001 From: tianshujie Date: Fri, 23 Sep 2022 10:22:32 +0800 Subject: [PATCH 3/4] * Finish task #70008. --- module/bug/model.php | 2 +- module/design/model.php | 2 +- module/story/model.php | 2 +- module/task/model.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module/bug/model.php b/module/bug/model.php index 120a8bff05..305a6d6d50 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -3492,7 +3492,7 @@ class bugModel extends model if(!empty($bug->assignedTo) and $bug->assignedTo != $this->app->user->account) $btnClass = $btnTextClass = 'assigned-other'; $btnClass .= $bug->assignedTo == 'closed' ? ' disabled' : ''; - $btnClass = "iframe btn btn-icon-left btn-sm {$btnClass}"; + $btnClass .= ' iframe btn btn-icon-left btn-sm'; $assignToLink = helper::createLink('bug', 'assignTo', "bugID=$bug->id", '', true); $assignToHtml = html::a($assignToLink, " {$assignedToText}", '', "class='$btnClass'"); diff --git a/module/design/model.php b/module/design/model.php index 95fa962721..2f72db44b1 100644 --- a/module/design/model.php +++ b/module/design/model.php @@ -479,7 +479,7 @@ class designModel extends model if(!empty($design->assignedTo) and $design->assignedTo != $this->app->user->account) $btnClass = $btnTextClass = 'assigned-other'; $btnClass .= $design->assignedTo == 'closed' ? ' disabled' : ''; - $btnClass = "iframe btn btn-icon-left btn-sm {$btnClass}"; + $btnClass .= ' iframe btn btn-icon-left btn-sm'; $assignToLink = helper::createLink('design', 'assignTo', "designID=$design->id", '', true); $assignToHtml = html::a($assignToLink, " {$assignedToText}", '', "class='$btnClass'"); diff --git a/module/story/model.php b/module/story/model.php index 829f6bede9..69aa0c1a49 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -4920,7 +4920,7 @@ class storyModel extends model if(!empty($story->assignedTo) and $story->assignedTo != $this->app->user->account) $btnClass = $btnTextClass = 'assigned-other'; $btnClass .= $story->assignedTo == 'closed' ? ' disabled' : ''; - $btnClass = "iframe btn btn-icon-left btn-sm {$btnClass}"; + $btnClass .= 'iframe btn btn-icon-left btn-sm'; $assignToLink = helper::createLink('story', 'assignTo', "storyID=$story->id&kanbanGroup=default&from=&storyType=$story->type", '', true); $assignToHtml = html::a($assignToLink, " {$assignedToText}", '', "class='$btnClass'"); diff --git a/module/task/model.php b/module/task/model.php index fb543e1236..e2ce9574db 100755 --- a/module/task/model.php +++ b/module/task/model.php @@ -3875,7 +3875,7 @@ class taskModel extends model if(!empty($task->assignedTo) and $task->assignedTo != $this->app->user->account) $btnClass = $btnTextClass = 'assigned-other'; $btnClass .= $task->assignedTo == 'closed' ? ' disabled' : ''; - $btnClass = "iframe btn btn-icon-left btn-sm {$btnClass}"; + $btnClass .= ' iframe btn btn-icon-left btn-sm'; $assignToLink = $task->assignedTo == 'closed' ? '#' : helper::createLink('task', 'assignTo', "executionID=$task->execution&taskID=$task->id", '', true); $assignToHtml = html::a($assignToLink, " {$assignedToText}", '', "class='$btnClass'"); From b8206c973d9121b7c155be9d408e001268b6b367 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Fri, 23 Sep 2022 10:32:19 +0800 Subject: [PATCH 4/4] * Finish task #70008. --- module/story/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/story/model.php b/module/story/model.php index 69aa0c1a49..5fedffa416 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -4920,7 +4920,7 @@ class storyModel extends model if(!empty($story->assignedTo) and $story->assignedTo != $this->app->user->account) $btnClass = $btnTextClass = 'assigned-other'; $btnClass .= $story->assignedTo == 'closed' ? ' disabled' : ''; - $btnClass .= 'iframe btn btn-icon-left btn-sm'; + $btnClass .= ' iframe btn btn-icon-left btn-sm'; $assignToLink = helper::createLink('story', 'assignTo', "storyID=$story->id&kanbanGroup=default&from=&storyType=$story->type", '', true); $assignToHtml = html::a($assignToLink, " {$assignedToText}", '', "class='$btnClass'");