From 98e33c5df33f0e1a543daf01ab6ef503f590d47e Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Tue, 23 Jan 2024 10:31:07 +0800
Subject: [PATCH] * Fix bug #43883.

---
 module/task/ui/common.field.php | 2 +-
 module/task/ui/create.field.php | 4 ++--
 module/task/ui/create.html.php  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/module/task/ui/common.field.php b/module/task/ui/common.field.php
index f3d4b7e8d2..7c124518de 100644
--- a/module/task/ui/common.field.php
+++ b/module/task/ui/common.field.php
@@ -5,7 +5,7 @@ global $lang, $config;
 $fields = defineFieldList('task');
 
 $fields->field('execution')
-    ->hidden(data('execution.type') == 'kanban' && $config->vision != 'lite')
+    ->hidden((data('execution.type') == 'kanban' && $config->vision != 'lite') || empty(data('execution.multiple')))
     ->control('picker')
     ->items(data('executions'))
     ->value(data('execution.id'));
diff --git a/module/task/ui/create.field.php b/module/task/ui/create.field.php
index 4f213e1a2b..44d9da1421 100644
--- a/module/task/ui/create.field.php
+++ b/module/task/ui/create.field.php
@@ -68,11 +68,11 @@ $fields->field('assignedToBox')
 
 /* Set name field width. */
 $nameWidth = 'w-1/2';
-if(empty(data('features.story')) && data('execution.type') != 'kanban') $nameWidth .= ' full:w-full';
+if(empty(data('features.story')) && data('execution.type') != 'kanban' && !empty(data('execution.multiple'))) $nameWidth .= ' full:w-full';
 if(data('execution.type') == 'kanban') $nameWidth .= ' lite:w-full';
 $fields->field('name')->className($nameWidth);
 
-if(!empty(data('features.story')) && data('execution.type') == 'kanban')
+if(!empty(data('features.story')) && (data('execution.type') == 'kanban' || empty(data('execution.multiple'))))
 {
     $fields->field('module')->wrapBefore();
 }
diff --git a/module/task/ui/create.html.php b/module/task/ui/create.html.php
index 9bb3343a76..5481b27604 100644
--- a/module/task/ui/create.html.php
+++ b/module/task/ui/create.html.php
@@ -28,14 +28,14 @@ $fields->autoLoad('execution', 'execution,type,name,assignedToBox,region,lane,mo
 
 $fields->orders('name,assignedToBox', 'module,testStoryBox', 'desc,module,storyBox');
 $fields->fullModeOrders('type,module,storyBox,testStoryBox', 'desc,files,mailto,keywords');
-if($execution->type == 'kanban')
+if($execution->type == 'kanban' || empty(data('execution.multiple')))
 {
     $fields->orders('desc,module,storyBox', 'type,assignedToBox,region,lane');
     $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')
+if(empty($features['story']) && $execution->type != 'kanban' && !empty(data('execution.multiple')))
 {
     $fields->fullModeOrders('type,module,storyBox,testStoryBox,assignedToBox', 'desc,files,mailto,keywords');
 }