From 49bbc9c0a27acf2dd18746c25f76c55815eb71c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=B9=BF=E6=98=8E?= <sunguangming@cnezsoft.com>
Date: Tue, 19 Apr 2022 14:41:52 +0800
Subject: [PATCH 1/2] * Fix export bug.

---
 module/bug/control.php   | 2 +-
 module/story/control.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/bug/control.php b/module/bug/control.php
index 92f7ba569d..f9a9c9f320 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -2153,7 +2153,7 @@ class bug extends control
                 if(isset($bugLang->resolutionList[$bug->resolution])) $bug->resolution = $bugLang->resolutionList[$bug->resolution];
 
                 if(isset($users[$bug->openedBy]))     $bug->openedBy     = $users[$bug->openedBy];
-                if(isset($users[$bug->assignedTo]))   $bug->assignedTo   = $users[$bug->assignedTo];
+                if(isset($users[$bug->assignedTo]))   $bug->assignedTo   = $users[$bug->assignedTo] . "(#$bug->assignedTo)";
                 if(isset($users[$bug->resolvedBy]))   $bug->resolvedBy   = $users[$bug->resolvedBy];
                 if(isset($users[$bug->lastEditedBy])) $bug->lastEditedBy = $users[$bug->lastEditedBy];
                 if(isset($users[$bug->closedBy]))     $bug->closedBy     = $users[$bug->closedBy];
diff --git a/module/story/control.php b/module/story/control.php
index 1652a7d852..2a8b7da69e 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -2402,7 +2402,7 @@ class story extends control
                 if(isset($storyLang->sourceList[$story->sourceNote]))   $story->sourceNote   = $storyLang->sourceList[$story->sourceNote];
 
                 if(isset($users[$story->openedBy]))     $story->openedBy     = $users[$story->openedBy];
-                if(isset($users[$story->assignedTo]))   $story->assignedTo   = $users[$story->assignedTo];
+                if(isset($users[$story->assignedTo]))   $story->assignedTo   = $users[$story->assignedTo] . "(#$story->assignedTo)";
                 if(isset($users[$story->lastEditedBy])) $story->lastEditedBy = $users[$story->lastEditedBy];
                 if(isset($users[$story->closedBy]))     $story->closedBy     = $users[$story->closedBy];
 

From 18fa7382dd0c02a20ac78d1b6d6a8c1f7dce71ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=B9=BF=E6=98=8E?= <sunguangming@cnezsoft.com>
Date: Tue, 19 Apr 2022 16:39:44 +0800
Subject: [PATCH 2/2] * Fix workflow bug.

---
 module/bug/view/batchcreate.html.php   | 26 +++++++++++++++++++++++---
 module/story/view/batchcreate.html.php |  9 ++++++++-
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/module/bug/view/batchcreate.html.php b/module/bug/view/batchcreate.html.php
index 7c3e8c87f7..f83e38018b 100644
--- a/module/bug/view/batchcreate.html.php
+++ b/module/bug/view/batchcreate.html.php
@@ -125,7 +125,13 @@
             <td class='<?php echo zget($visibleFields, 'os', 'hidden')?>' style='overflow:visible'>      <?php echo html::select("oses[$i]", $lang->bug->osList, $os, "class='form-control chosen'");?></td>
             <td class='<?php echo zget($visibleFields, 'browser', 'hidden')?>' style='overflow:visible'> <?php echo html::select("browsers[$i]", $lang->bug->browserList, $browser, "class='form-control chosen'");?></td>
             <td class='<?php echo zget($visibleFields, 'keywords', 'hidden')?>'><?php echo html::input("keywords[$i]", '', "class='form-control'");?></td>
-            <?php foreach($extendFields as $extendField) echo "<td" . (($extendField->control == 'select' or $extendField->control == 'multi-select') ? " style='overflow:visible'" : '') . ">" . $this->loadModel('flow')->getFieldControl($extendField, '', $extendField->field . "[$i]") . "</td>";?>
+            <?php foreach($extendFields as $extendField) 
+            {
+                $object = new stdclass();
+                $object->{$extendField->field} = $extendField->default;
+                echo "<td" . (($extendField->control == 'select' or $extendField->control == 'multi-select') ? " style='overflow:visible'" : '') . ">" . $this->loadModel('flow')->getFieldControl($extendField, $object, $extendField->field . "[$i]") . "</td>";
+            }
+            ?>
           </tr>
           <?php $i++;?>
           <?php endforeach;?>
@@ -172,7 +178,14 @@
             <td class='<?php echo zget($visibleFields, 'os', 'hidden')?>' style='overflow:visible'>      <?php echo html::select("oses[$i]", $lang->bug->osList, $os, "class='form-control chosen'");?></td>
             <td class='<?php echo zget($visibleFields, 'browser', 'hidden')?>' style='overflow:visible'> <?php echo html::select("browsers[$i]", $lang->bug->browserList, $browser, "class='form-control chosen'");?></td>
             <td class='<?php echo zget($visibleFields, 'keywords', 'hidden')?>'><?php echo html::input("keywords[$i]", '', "class='form-control'");?></td>
-            <?php foreach($extendFields as $extendField) echo "<td" . (($extendField->control == 'select' or $extendField->control == 'multi-select') ? " style='overflow:visible'" : '') . ">" . $this->loadModel('flow')->getFieldControl($extendField, '', $extendField->field . "[$i]") . "</td>";?>
+            <?php 
+            foreach($extendFields as $extendField) 
+            {
+                $object = new stdclass();
+                $object->{$extendField->field} = $extendField->default;
+                echo "<td" . (($extendField->control == 'select' or $extendField->control == 'multi-select') ? " style='overflow:visible'" : '') . ">" . $this->loadModel('flow')->getFieldControl($extendField, '', $extendField->field . "[$i]") . "</td>";
+            }
+            ?>
           </tr>
           <?php endfor;?>
         </tbody>
@@ -218,7 +231,14 @@
       <td class='<?php echo zget($visibleFields, 'os', 'hidden')?>' style='overflow:visible'>      <?php echo html::select("oses[%s]", $lang->bug->osList, $os, "class='form-control chosen'");?></td>
       <td class='<?php echo zget($visibleFields, 'browser', 'hidden')?>' style='overflow:visible'> <?php echo html::select("browsers[%s]", $lang->bug->browserList, $browser, "class='form-control chosen'");?></td>
       <td class='<?php echo zget($visibleFields, 'keywords', 'hidden')?>'><?php echo html::input("keywords[%s]", '', "class='form-control'");?></td>
-      <?php foreach($extendFields as $extendField) echo "<td" . (($extendField->control == 'select' or $extendField->control == 'multi-select') ? " style='overflow:visible'" : '') . ">" . $this->loadModel('flow')->getFieldControl($extendField, '', $extendField->field . "[%s]") . "</td>";?>
+      <?php 
+      foreach($extendFields as $extendField) 
+      {
+          $object = new stdclass();
+          $object->{$extendField->field} = $extendField->default;
+          echo "<td" . (($extendField->control == 'select' or $extendField->control == 'multi-select') ? " style='overflow:visible'" : '') . ">" . $this->loadModel('flow')->getFieldControl($extendField, '', $extendField->field . "[%s]") . "</td>";
+      }
+      ?>
     </tr>
   </tbody>
 </table>
diff --git a/module/story/view/batchcreate.html.php b/module/story/view/batchcreate.html.php
index 8a89e14a39..67321db43c 100644
--- a/module/story/view/batchcreate.html.php
+++ b/module/story/view/batchcreate.html.php
@@ -114,7 +114,14 @@
               </div>
             </td>
             <td class='<?php echo zget($visibleFields, 'keywords', 'hidden')?>'><?php echo html::input('keywords[$id]', '', "class='form-control'");?></td>
-            <?php foreach($extendFields as $extendField) echo "<td" . (($extendField->control == 'select' or $extendField->control == 'multi-select') ? " style='overflow:visible'" : '') . ">" . $this->loadModel('flow')->getFieldControl($extendField, '', $extendField->field . '[$id]') . "</td>";?>
+            <?php 
+            foreach($extendFields as $extendField) 
+            {
+                $object = new stdclass();
+                $object->{$extendField->field} = $extendField->default;
+                echo "<td" . (($extendField->control == 'select' or $extendField->control == 'multi-select') ? " style='overflow:visible'" : '') . ">" . $this->loadModel('flow')->getFieldControl($extendField, $object, $extendField->field . '[$id]') . "</td>";
+            }
+            ?>
           </tr>
         </tbody>
         <tfoot>