From a8bdc9bc6ceab9815e4e6fb4e24290d511418dae Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Thu, 22 Sep 2022 09:07:11 +0800
Subject: [PATCH] * 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 "<span class='$btnTextClass'>" . zget($users, $run->assignedTo) . '</span>';
                 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;