From ccb98adb415b9fe5b21fc9d1cdbca36a4f94f3b7 Mon Sep 17 00:00:00 2001
From: zhouxin <zhouxin@easycorp.ltd>
Date: Mon, 15 Nov 2021 10:44:29 +0800
Subject: [PATCH] Fix bug #16209.

---
 module/product/control.php     | 12 ++++++++++--
 module/story/css/batchedit.css |  4 +++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/module/product/control.php b/module/product/control.php
index 9d409d26cd..bc1a794a16 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -216,7 +216,7 @@ class product extends control
             $this->app->loadLang('datatable');
             $this->lang->datatable->showBranch = sprintf($this->lang->datatable->showBranch, $this->lang->product->branchName[$product->type]);
         }
-        
+
         /* Get stories. */
         if($this->app->rawModule == 'projectstory')
         {
@@ -992,16 +992,24 @@ class product extends control
         }
 
         $field = $fieldID ? "plans[$fieldID]" : 'plan';
-        $output = html::select($field, $plans, $planID, "class='form-control chosen'");
+        $output  = "<div class='table-row'>";
+        $output .= "<div class='table-col'>";
+        $output .= html::select($field, $plans, $planID, "class='form-control chosen'");
+        $output .= "</div>";
         if(count($plans) == 1 and $needCreate)
         {
+            $output .= "<div class='table-col'>";
             $output .= "<div class='input-group-btn'>";
             $output .= html::a($this->createLink('productplan', 'create', "productID=$productID&branch=$branch", '', true), "<i class='icon icon-plus'></i>", '', "class='btn btn-icon' data-toggle='modal' data-type='iframe' data-width='95%' title='{$this->lang->productplan->create}'");
             $output .= '</div>';
+            $output .= '</div>';
+            $output .= "<div class='table-col'>";
             $output .= "<div class='input-group-btn'>";
             $output .= html::a("javascript:void(0)", "<i class='icon icon-refresh'></i>", '', "class='btn btn-icon refresh' data-toggle='tooltip' title='{$this->lang->refresh}' onclick='loadProductPlans($productID)'");
             $output .= '</div>';
+            $output .= '</div>';
         }
+        $output .= "</div>";
         die($output);
     }
 
diff --git a/module/story/css/batchedit.css b/module/story/css/batchedit.css
index fc90ab0786..9ffd2dddb8 100644
--- a/module/story/css/batchedit.css
+++ b/module/story/css/batchedit.css
@@ -2,9 +2,11 @@
 .c-id {width: 40px;}
 .c-estimate {width: 50px;}
 .c-branch, .c-module {width: 120px;}
-.c-plan, .c-title {width: 150px;}
+.c-title {width: 150px;}
+.c-plan {width: 170px;}
 .c-category {width: 90px;}
 .c-pri {width: 70px;}
 .c-source {width: 130px;}
 .c-note, .c-stage, .c-reason {width: 100px;}
 .c-keywords {width: 80px;}
+#batchEditForm > div > table > tbody > tr > td:nth-child(4) > div > div:nth-child(1) {width: 60%;}