From 7b5b3076d514590ffabe5b31f24437c19c3ecddc Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Mon, 22 Jan 2024 09:23:54 +0800
Subject: [PATCH] * Fix bug #44516.

---
 module/task/css/create.ui.css  |  1 +
 module/task/js/create.ui.js    | 24 ++++++++++++++++++++++--
 module/task/ui/create.html.php |  6 +++---
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/module/task/css/create.ui.css b/module/task/css/create.ui.css
index a8544614b4..e3a13de8f0 100644
--- a/module/task/css/create.ui.css
+++ b/module/task/css/create.ui.css
@@ -3,3 +3,4 @@
 .assignedToBox .add-team {margin-bottom: 5px}
 .assignedToList {display: flex; align-items: center; overflow: hidden;}
 .assignedToList .picker-multi-selection, .assignedToList .icon{margin-right: 5px; margin-bottom: 5px}
+.panel-heading {z-index: 2 !important;}
diff --git a/module/task/js/create.ui.js b/module/task/js/create.ui.js
index c453d7f6cb..593ed60a14 100644
--- a/module/task/js/create.ui.js
+++ b/module/task/js/create.ui.js
@@ -77,10 +77,20 @@ function toggleSelectTestStory()
         $('[data-name=datePlan]').addClass('hidden');
         $('[data-name=estimate]').addClass('hidden');
         $('[name=multiple]').closest('.checkbox-primary').addClass('hidden');
-
         $('[data-name=testStoryBox]').removeClass('hidden');
         $('#testStoryBox').load($.createLink('task', 'ajaxGetTestStories', 'executionID=' + executionID + '&taskID=' + taskID));
 
+        if($('[data-name=execution]').hasClass('hidden'))
+        {
+            $('[data-name=name]').removeClass('lite:w-full');
+            $('[data-name=pri]').removeClass('w-1/4').addClass('w-1/2 full:w-1/4');
+            $('[data-name=assignedToBox]').addClass('full:w-1/4');
+        }
+        else
+        {
+            $('[data-name=assignedToBox]').removeClass('w-1/2').addClass('w-1/4');
+        }
+
         $('[name^=multiple]').prop('checked', false);
         toggleTeam();
     }
@@ -91,8 +101,18 @@ function toggleSelectTestStory()
         $('[data-name=datePlan]').removeClass('hidden');
         $('[data-name=estimate]').removeClass('hidden');
         $('[name=multiple]').closest('.checkbox-primary').removeClass('hidden');
-
         $('[data-name=testStoryBox]').addClass('hidden');
+
+        if($('[data-name=execution]').hasClass('hidden'))
+        {
+            $('[data-name=name]').addClass('lite:w-full');
+            $('[data-name=pri]').addClass('w-1/4').removeClass('w-1/2 full:w-1/4');
+            $('[data-name=assignedBox]').removeClass('full:w-1/4');
+        }
+        else
+        {
+            $('[data-name=assignedToBox]').removeClass('w-1/4').addClass('w-1/2');
+        }
     }
 }
 
diff --git a/module/task/ui/create.html.php b/module/task/ui/create.html.php
index 8696e497ae..e3fe32429f 100644
--- a/module/task/ui/create.html.php
+++ b/module/task/ui/create.html.php
@@ -27,17 +27,17 @@ $fields = useFields('task.create');
 $fields->autoLoad('execution', 'execution,type,name,assignedToBox,region,lane,module,storyBox,datePlan,pri,estimate,desc,files,mailto,keywords,after,testStoryBox');
 
 $fields->orders('name,assignedToBox', 'module,testStoryBox', 'desc,module,storyBox');
-$fields->fullModeOrders('type,module,storyBox', 'desc,files,mailto,keywords');
+$fields->fullModeOrders('type,module,storyBox,testStoryBox', 'desc,files,mailto,keywords');
 if($execution->type == 'kanban')
 {
     $fields->orders('desc,module,storyBox', 'type,assignedToBox,region,lane');
-    $fields->fullModeOrders('name,assignedToBox', 'type,module,storyBox', 'desc,files,mailto,keywords');
+    $fields->fullModeOrders('name,assignedToBox', 'type,module,storyBox,testStoryBox', 'desc,files,mailto,keywords');
     if(empty($features['story'])) $fields->fullModeOrders('type,module,storyBox', 'name,assignedToBox', 'desc,files,mailto,keywords');
 }
 
 if(empty($features['story']) && $execution->type != 'kanban')
 {
-    $fields->fullModeOrders('type,module,storyBox,assignedToBox', 'desc,files,mailto,keywords');
+    $fields->fullModeOrders('type,module,storyBox,testStoryBox,assignedToBox', 'desc,files,mailto,keywords');
 }
 
 $teamForm = array();