From f9b2fd0affa2193f374853a3d7ddf2c931fdb43b Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Mon, 17 Oct 2022 15:46:56 +0800
Subject: [PATCH] * Fix bug #28531.

---
 module/task/css/common.css         | 14 ++++++++++++++
 module/task/css/create.css         | 13 -------------
 module/task/css/edit.css           | 13 -------------
 module/task/view/taskteam.html.php | 11 +++++++++--
 4 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/module/task/css/common.css b/module/task/css/common.css
index 6ac775e840..5c6be38e22 100644
--- a/module/task/css/common.css
+++ b/module/task/css/common.css
@@ -1,2 +1,16 @@
 .body-modal > .main {padding: 20px;}
 .body-modal > .main .table-form {border: 1px solid #ddd;}
+
+#taskTeamEditor tr {padding: 8px 7px 8px 7px;}
+#taskTeamEditor td .chosen-single .chosen-search input,
+#taskTeamEditor tr td .chosen-single {height: 35px; line-height: 24px;}
+#taskTeamEditor td .chosen-single .chosen-search::before {top: 10px;}
+#taskTeamEditor tr td:first-child {width: 40px; position: relative;}
+.team-number {display: inline-block; width: 20px; height: 20px; line-height: 20px; border-radius: 10px; text-align: center; background: #f4f5f7;}
+#taskTeamEditor tr td:first-child .icon { position: absolute; top: 42px; left: 10.5px; display: block; font-size: 8px; color: #9ea3bd;;}
+#taskTeamEditor tr:last-child td:first-child .icon, #taskTeamEditor tr.member-last td:first-child .icon {display: none;}
+
+#modalTeam .modal-content input[type="text"]::input-placeholder{color: #c4c4c4;text-align: left;}
+#modalTeam .modal-content input[type="text"]::-webkit-input-placeholder{color: #c4c4c4;text-align: left;}
+#modalTeam .modal-content input[type="text"]::-moz-placeholder{color: #c4c4c4;text-align: left;}
+#modalTeam .modal-content input[type="text"]::-ms-input-placeholder{color: #c4c4c4;text-align: left;}
diff --git a/module/task/css/create.css b/module/task/css/create.css
index 676e62d8af..06d6b03211 100644
--- a/module/task/css/create.css
+++ b/module/task/css/create.css
@@ -33,16 +33,3 @@
 #modalTeam .modal-header {height: 44px; padding: 10px 20px; margin: 0;}
 #modalTeam .modal-header .modal-title {font-size: 13px; line-height: 24px;}
 #modalTeam .modal-body {padding: 12px 13px 20px; max-height: 296px!important; overflow-y: scroll!important;}
-#taskTeamEditor tr {padding: 8px 7px 8px 7px;}
-#taskTeamEditor td .chosen-single .chosen-search input,
-#taskTeamEditor tr td .chosen-single {height: 35px; line-height: 24px;}
-#taskTeamEditor td .chosen-single .chosen-search::before {top: 10px;}
-#taskTeamEditor tr td:first-child {width: 40px; position: relative;}
-.team-number {display: inline-block; width: 20px; height: 20px; line-height: 20px; border-radius: 10px; text-align: center; background: #f4f5f7;}
-#taskTeamEditor tr td:first-child .icon { position: absolute; top: 42px; left: 10.5px; display: block; font-size: 8px; color: #9ea3bd;;}
-#taskTeamEditor tr:last-child td:first-child .icon {display: none;}
-
-#modalTeam .modal-content input[type="text"]::input-placeholder{color: #c4c4c4;text-align: left;}
-#modalTeam .modal-content input[type="text"]::-webkit-input-placeholder{color: #c4c4c4;text-align: left;}
-#modalTeam .modal-content input[type="text"]::-moz-placeholder{color: #c4c4c4;text-align: left;}
-#modalTeam .modal-content input[type="text"]::-ms-input-placeholder{color: #c4c4c4;text-align: left;}
diff --git a/module/task/css/edit.css b/module/task/css/edit.css
index 8d0f467549..16a92a4e26 100644
--- a/module/task/css/edit.css
+++ b/module/task/css/edit.css
@@ -8,16 +8,3 @@
 #modalTeam .modal-content {padding: 20px 13px 0; height: 340px;max-height: 296px!important; overflow-y: scroll!important;}
 #modalTeam .modal-header {height: 44px; padding: 10px 20px; margin: 0; }
 #modalTeam .modal-header .modal-title {font-size: 13px; line-height: 24px;}
-#taskTeamEditor tr {padding: 8px 7px 8px 7px;}
-#taskTeamEditor td .chosen-single .chosen-search input,
-#taskTeamEditor tr td .chosen-single {height: 35px; line-height: 24px;}
-#taskTeamEditor td .chosen-single .chosen-search::before {top: 10px;}
-#taskTeamEditor tr td:first-child {width: 40px; position: relative;}
-.team-number {display: inline-block; width: 20px; height: 20px; line-height: 20px; border-radius: 10px; text-align: center; background: #f4f5f7;}
-#taskTeamEditor tr td:first-child .icon { position: absolute; top: 42px; left: 10.5px; display: block; font-size: 8px; color: #9ea3bd;;}
-#taskTeamEditor tr:last-child td:first-child .icon, #taskTeamEditor tr.member-last td:first-child .icon {display: none;}
-
-#modalTeam .modal-content input[type="text"]::input-placeholder{color: #c4c4c4;text-align: left;}
-#modalTeam .modal-content input[type="text"]::-webkit-input-placeholder{color: #c4c4c4;text-align: left;}
-#modalTeam .modal-content input[type="text"]::-moz-placeholder{color: #c4c4c4;text-align: left;}
-#modalTeam .modal-content input[type="text"]::-ms-input-placeholder{color: #c4c4c4;text-align: left;}
diff --git a/module/task/view/taskteam.html.php b/module/task/view/taskteam.html.php
index 601112122d..2c7995aad8 100644
--- a/module/task/view/taskteam.html.php
+++ b/module/task/view/taskteam.html.php
@@ -4,6 +4,7 @@
 #taskTeamEditor .estimateBox input {background-color: #fff; border-right-width: 0px;}
 #taskTeamEditor input, #taskTeamEditor span, #taskTeamEditor .chosen-container > a {border-color: #eee;}
 </style>
+<?php $hiddenArrow = (empty($task->mode) or $task->mode == 'linear') ? '' : 'hidden';?>
 <?php $i = 1;?>
 <?php if(!empty($task->team)):?>
 <?php foreach($task->team as $member):?>
@@ -27,7 +28,7 @@ if($task->mode == 'multi' and $app->rawMethod == 'activate') $hourDisabled = fal
 <tr class='member member-<?php echo $memberStatus;?>' data-estimate='<?php echo (float)$member->estimate?>' data-consumed='<?php echo (float)$member->consumed?>' data-left='<?php echo (float)$member->left?>'>
   <td>
     <span class="team-number"><?php echo $i;?></span>
-    <i class="icon icon-angle-down"></i>
+    <i class="icon icon-angle-down <?php echo $hiddenArrow;?>"></i>
   </td>
   <td class='w-250px'>
     <?php echo html::select("team[]", $members, $member->account, "class='form-control chosen'" . ($memberDisabled ? ' disabled' : ''))?>
@@ -58,7 +59,7 @@ if($task->mode == 'multi' and $app->rawMethod == 'activate') $hourDisabled = fal
 <tr class='template teamTemplate member member-wait'>
   <td>
     <span class="team-number"><?php echo $i;?></span>
-    <i class="icon icon-angle-down"></i>
+    <i class="icon icon-angle-down <?php echo $hiddenArrow;?>"></i>
   </td>
   <td class='w-250px'>
     <?php echo html::select("team[]", $members, '', "class='form-control chosen'")?>
@@ -226,6 +227,10 @@ $(document).ready(function()
         {
             $newRow.removeClass('highlight');
         }, 1600);
+
+        var taskMode = $('#mode').val();
+        if(taskMode == 'multi') $('#taskTeamEditor tr.member .icon-angle-down').addClass('hidden');
+
         disableMembers();
         adjustButtons();
         setLineNumber();
@@ -278,9 +283,11 @@ $(document).ready(function()
         if($(this).val() == 'multi')
         {
             disableMembers();
+            $('#taskTeamEditor tr.member .icon-angle-down').addClass('hidden');
         }
         else
         {
+            $('#taskTeamEditor tr.member .icon-angle-down').removeClass('hidden');
             $taskTeamEditor.find('select#team').each(function()
             {
                 $(this).find('option:disabled').removeAttr('disabled').trigger("chosen:updated");