From 4dd1445e8bced2dcab7f10ea4e9f80607ebb863a Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Tue, 21 Jun 2022 05:48:57 +0000
Subject: [PATCH] * Finish task #57872.

---
 extension/lite/task/ext/view/batchcreate.html.php | 2 +-
 module/company/control.php                        | 9 +++++++++
 module/company/view/dynamic.html.php              | 2 +-
 module/task/view/batchcreate.html.php             | 2 +-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/extension/lite/task/ext/view/batchcreate.html.php b/extension/lite/task/ext/view/batchcreate.html.php
index 69fe4dc162..a6a4a28c62 100644
--- a/extension/lite/task/ext/view/batchcreate.html.php
+++ b/extension/lite/task/ext/view/batchcreate.html.php
@@ -114,7 +114,7 @@
               <div class='input-group'>
                 <?php echo html::select("story[$i]", $stories, $currentStory, "class='form-control chosen' onchange='setStoryRelated($i)'");?>
                 <span class='input-group-btn'>
-                  <a id='preview<?php echo $i;?>' href='#' class='btn iframe btn-link btn-icon btn-copy' disabled='disabled' title='<?php echo $lang->preview; ?>'><i class='icon-search'></i></a>
+                  <a id='preview<?php echo $i;?>' href='#' class='btn iframe btn-link btn-icon btn-copy' disabled='disabled' title='<?php echo $lang->preview; ?>'><i class='icon-eye'></i></a>
                   <a href='javascript:copyStoryTitle(<?php echo $i;?>)' class='btn btn-link btn-icon btn-copy' title='<?php echo $lang->task->copyStoryTitle; ?>'><i class='icon-arrow-right'></i></a>
                   <?php echo html::hidden("storyEstimate$i") . html::hidden("storyDesc$i") . html::hidden("storyPri$i");?>
                 </span>
diff --git a/module/company/control.php b/module/company/control.php
index 346fb6865c..523e7c954b 100644
--- a/module/company/control.php
+++ b/module/company/control.php
@@ -224,6 +224,15 @@ class company extends control
 
         /* Get executions' list.*/
         $executions = $this->loadModel('execution')->getPairs(0, 'all', 'nocode');
+        $executionsIDList = array_keys($executions);
+        $executionsList = $this->execution->getByIdList($executionsIDList);
+        foreach($executionsList as $executionsID => $execution)
+        {
+            foreach($projects as $projectsID => $projectName)
+            {
+                if($execution->project == $projectsID) $executions[$execution->id] = $projectName . '/' . $execution->name;
+            }
+        }
         $executions = array($this->lang->execution->common) + $executions;
         $this->view->executions = $executions;
 
diff --git a/module/company/view/dynamic.html.php b/module/company/view/dynamic.html.php
index d61d57213f..8fdb863bb0 100644
--- a/module/company/view/dynamic.html.php
+++ b/module/company/view/dynamic.html.php
@@ -35,7 +35,7 @@
     <?php if($config->systemMode == 'new'):?>
     <div class="input-control space c-project"><?php echo html::select('project', $projects, $projectID, 'class="form-control chosen" data-max_drop_width="215"');?></div>
     <?php endif;?>
-    <div class="input-control space c-execution"><?php echo html::select('execution', $executions, $executionID, 'class="form-control chosen" data-max_drop_width="215"'); ?></div>
+    <div class="input-control space c-execution"><?php echo html::select('execution', $executions, $executionID, 'class="form-control chosen" data-max_drop_width="350"'); ?></div>
     <div class="input-control space c-order"><?php echo html::select('orderBy', $lang->company->order, $orderBy, 'class="form-control chosen" data-max_drop_width="215" data-disable_search="true"'); ?></div>
     <a class="btn btn-link querybox-toggle" id="bysearchTab"><i class="icon icon-search muted"></i> <?php echo $lang->action->dynamic->search;?></a>
   </div>
diff --git a/module/task/view/batchcreate.html.php b/module/task/view/batchcreate.html.php
index 7d2eff9f44..363d589017 100755
--- a/module/task/view/batchcreate.html.php
+++ b/module/task/view/batchcreate.html.php
@@ -122,7 +122,7 @@
               <div class='input-group'>
                 <?php echo html::select("story[$i]", $stories, $currentStory, "class='form-control chosen' onchange='setStoryRelated($i)'");?>
                 <span class='input-group-btn'>
-                  <a id='preview<?php echo $i;?>' href='#' class='btn iframe btn-link btn-icon btn-copy' disabled='disabled' title='<?php echo $lang->preview; ?>'><i class='icon-search'></i></a>
+                  <a id='preview<?php echo $i;?>' href='#' class='btn iframe btn-link btn-icon btn-copy' disabled='disabled' title='<?php echo $lang->preview; ?>'><i class='icon-eye'></i></a>
                   <a href='javascript:copyStoryTitle(<?php echo $i;?>)' class='btn btn-link btn-icon btn-copy' title='<?php echo $lang->task->copyStoryTitle; ?>'><i class='icon-arrow-right'></i></a>
                   <?php echo html::hidden("storyEstimate$i") . html::hidden("storyDesc$i") . html::hidden("storyPri$i");?>
                 </span>