From 971579ab221785edf15fd8ff6c9df9593b21655c Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Thu, 5 May 2022 13:31:59 +0800
Subject: [PATCH 1/2] * Fix bug of batch create story in kanban with upload
 images.

---
 module/story/control.php               | 1 +
 module/story/view/batchcreate.html.php | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/module/story/control.php b/module/story/control.php
index 4b6514ed82..7a40f67d3b 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -603,6 +603,7 @@ class story extends control
         $this->view->branches         = $branches;
         /* When the user is product owner or add story in project or not set review, the default is not to review. */
         $this->view->needReview       = ($this->app->user->account == $product->PO || $executionID > 0 || $this->config->story->needReview == 0) ? 0 : 1;
+        $this->view->executionID      = $executionID;
 
         $this->display();
     }
diff --git a/module/story/view/batchcreate.html.php b/module/story/view/batchcreate.html.php
index 19525945f6..cf7ce570b7 100755
--- a/module/story/view/batchcreate.html.php
+++ b/module/story/view/batchcreate.html.php
@@ -15,7 +15,7 @@
   <div class="main-header">
     <h2><?php echo $storyID ? $storyTitle . ' - ' . $this->lang->story->subdivide : $this->lang->story->batchCreate;?></h2>
     <div class="pull-right btn-toolbar">
-      <?php if(common::hasPriv('file', 'uploadImages')) echo html::a($this->createLink('file', 'uploadImages', 'module=story&params=' . helper::safe64Encode("productID=$productID&branch=$branch&moduleID=$moduleID&storyID=$storyID&executionID=&plan=&type=$type")), $lang->uploadImages, '', "data-toggle='modal' data-type='iframe' class='btn btn-primary' data-width='70%'")?>
+      <?php if(common::hasPriv('file', 'uploadImages')) echo html::a($this->createLink('file', 'uploadImages', 'module=story&params=' . helper::safe64Encode("productID=$productID&branch=$branch&moduleID=$moduleID&storyID=$storyID&executionID=$executionID&plan=&type=$type")), $lang->uploadImages, '', "data-toggle='modal' data-type='iframe' class='btn btn-primary' data-width='70%'")?>
       <button type='button' data-toggle='modal' data-target="#importLinesModal" class="btn btn-primary"><?php echo $lang->pasteText;?></button>
       <?php $customLink = $this->createLink('custom', 'ajaxSaveCustomFields', 'module=story&section=custom&key=batchCreateFields')?>
       <?php include '../../common/view/customfield.html.php';?>
@@ -68,7 +68,7 @@
             <th class='c-keywords<?php echo zget($visibleFields, 'keywords', ' hidden') . zget($requiredFields, 'keywords', '', ' required');?>'><?php echo $lang->story->keywords;?></th>
             <?php
             $extendFields = $this->story->getFlowExtendFields();
-            foreach($extendFields as $extendField) 
+            foreach($extendFields as $extendField)
             {
                 $required = strpos(",$extendField->rules,", ',1,') !== false ? 'required' : '';
                 echo "<th class='c-extend $required'>{$extendField->name}</th>";
@@ -118,9 +118,9 @@
               </div>
             </td>
             <td class='<?php echo zget($visibleFields, 'keywords', 'hidden')?>'><?php echo html::input('keywords[$id]', '', "class='form-control'");?></td>
-            <?php 
+            <?php
             $this->loadModel('flow');
-            foreach($extendFields as $extendField) 
+            foreach($extendFields as $extendField)
             {
                 $object = new stdclass();
                 $object->{$extendField->field} = $extendField->default;

From 88f641e2a7651705e3df18c022521850ab27ca63 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Thu, 5 May 2022 13:49:05 +0800
Subject: [PATCH 2/2] * Append build branch when project unlink this branch.

---
 module/build/control.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/build/control.php b/module/build/control.php
index 147c629a53..b918fdf58e 100644
--- a/module/build/control.php
+++ b/module/build/control.php
@@ -179,6 +179,7 @@ class build extends control
         {
             $branchTagOption[$branchInfo->id] = $branchInfo->name . ($branchInfo->status == 'closed' ? ' (' . $this->lang->branch->statusList['closed'] . ')' : '');
         }
+        if(!isset($branchTagOption[$build->branch])) $branchTagOption[$build->branch] = $this->branch->getById($build->branch, 0, 'name');
 
         foreach($productGroups as $product) $products[$product->id] = $product->name;