From 1353d674c7162a54f54474eb4f72076aa0cd154b Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Mon, 24 Jan 2022 14:19:35 +0800
Subject: [PATCH] * Fix bug #18883 and #18891.

---
 module/execution/control.php          | 1 +
 module/execution/view/create.html.php | 4 ----
 module/execution/view/edit.html.php   | 4 ++++
 module/kanban/view/space.html.php     | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index 6a7798ec9c..b24061684b 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1615,6 +1615,7 @@ class execution extends control
         $this->view->multiBranchProducts  = $this->product->getMultiBranchPairs();
         $this->view->productPlans         = $productPlans;
         $this->view->branchGroups         = $this->execution->getBranchByProduct(array_keys($linkedProducts), $this->config->systemMode == 'new' ? $execution->project : 0, 'noclosed', $linkedBranchList);
+        $this->view->teamMembers          = $this->execution->getTeamMembers($executionID);
         $this->display();
     }
 
diff --git a/module/execution/view/create.html.php b/module/execution/view/create.html.php
index 7cc9de664d..19c921774d 100644
--- a/module/execution/view/create.html.php
+++ b/module/execution/view/create.html.php
@@ -175,7 +175,6 @@
             </div>
           </td>
         </tr>
-        <?php if(empty($project) or $project->model != 'kanban'):?>
         <tr>
           <th><?php echo $lang->execution->teamname;?></th>
           <td><?php echo html::input('team', $team, "class='form-control'");?></td>
@@ -185,7 +184,6 @@
           <th><?php echo $lang->execution->copyTeam;?></th>
           <td><?php echo html::select('teams', $teams, $copyExecutionID, "class='form-control chosen' data-placeholder='{$lang->execution->copyTeamTip}'"); ?></td>
         </tr>
-        <?php endif;?>
         <tr>
           <th rowspan='2'><?php echo $lang->execution->owner;?></th>
           <td>
@@ -215,12 +213,10 @@
             </div>
           </td>
         </tr>
-        <?php if(empty($project) or $project->model != 'kanban'):?>
         <tr>
           <th><?php echo $lang->execution->team;?></th>
           <td colspan='3'><?php echo html::select('teamMembers[]', $users, '', "class='form-control chosen' multiple"); ?></td>
         </tr>
-        <?php endif;?>
         <tr>
           <th><?php echo (($from == 'execution') and ($config->systemMode == 'new')) ? $lang->execution->execDesc : $lang->execution->desc;?></th>
           <td colspan='3'>
diff --git a/module/execution/view/edit.html.php b/module/execution/view/edit.html.php
index d78120ecc3..994a879770 100644
--- a/module/execution/view/edit.html.php
+++ b/module/execution/view/edit.html.php
@@ -181,6 +181,10 @@
             </div>
           </td>
         </tr>
+        <tr>
+          <th><?php echo $lang->execution->team;?></th>
+          <td colspan='2'><?php echo html::select('teamMembers[]', $users, array_keys($teamMembers), "class='form-control chosen' multiple"); ?></td>
+        </tr>
         <tr>
           <th><?php echo $lang->execution->desc;?></th>
           <td colspan='2'><?php echo html::textarea('desc', htmlSpecialString($execution->desc), "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
diff --git a/module/kanban/view/space.html.php b/module/kanban/view/space.html.php
index 5b4f0d29a6..864755aacf 100644
--- a/module/kanban/view/space.html.php
+++ b/module/kanban/view/space.html.php
@@ -40,7 +40,7 @@
         <div class='spaceTitle pull-left'>
           <div><i class='icon-cube'></i></div>
           <div>
-            <h4>
+            <h4 title="<?php echo $space->name;?>">
               <?php if($space->status == 'closed'):?>
               <span class="label label-closed"><?php echo $lang->kanban->closed;?></span>
               <?php endif;?>