From ccd93e4b5b74504b84e6b6ebbb45aabe36719060 Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Thu, 18 Mar 2021 09:44:23 +0800
Subject: [PATCH]  * Fix task #36764.

---
 module/bug/css/create.css       |  1 -
 module/bug/js/common.js         |  1 +
 module/bug/view/create.html.php | 10 +++++++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/module/bug/css/create.css b/module/bug/css/create.css
index 750aea0dd8..554b1268aa 100644
--- a/module/bug/css/create.css
+++ b/module/bug/css/create.css
@@ -9,7 +9,6 @@ html[lang='en'] #deadlineTd .input-group-addon {padding: 5px 18px;}
 .bootbox-prompt .modal-dialog {width: 500px; margin-top: 10%;}
 
 #buildBoxActions {padding-left: 15px;}
-#executionIdBox {display: block;}
 
 #module + .chosen-container-single .chosen-single,
 #task + .chosen-container-single .chosen-single,
diff --git a/module/bug/js/common.js b/module/bug/js/common.js
index 4710eda4bf..faa4e49576 100644
--- a/module/bug/js/common.js
+++ b/module/bug/js/common.js
@@ -272,6 +272,7 @@ function loadProductExecutions(productID, projectID = 0)
     $('#executionIdBox').load(link, function()
     {
         $(this).find('select').chosen();
+        if(typeof(bugExecution) == 'string') $('#executionIdBox').prepend("<span class='input-group-addon' style='border-left-width: 1px;'>" + bugExecution + "</span>");
         if(required) $(this).addClass('required');
     });
 }
diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index 1bdd2ad2b7..d42be5ddbd 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -72,7 +72,7 @@ js::set('oldProjectID', $projectID);
           </tr>
           <?php $showExecution = (strpos(",$showFields,", ',execution,') !== false);?>
           <tr>
-            <th><?php echo ($showExecution) ? $lang->bug->execution : $lang->bug->type;?></th>
+            <th><?php echo ($showExecution) ? $lang->bug->project : $lang->bug->type;?></th>
 
             <?php if(!$showExecution):?>
             <?php $showOS      = strpos(",$showFields,", ',os,')      !== false;?>
@@ -97,8 +97,11 @@ js::set('oldProjectID', $projectID);
                 <div class='table-col' id='projectBox'>
                   <?php echo html::select('project', $projects, $projectID, "class='form-control chosen' onchange='loadProductExecutions({$productID}, this.value)'");?>
                 </div>
-                <div class='table-col' id='executionIdBox'>
-                  <?php echo html::select('execution', $executions, $executionID, "class='form-control chosen' onchange='loadExecutionRelated(this.value)'");?>
+                <div class='table-col'>
+                  <div class='input-group' id='executionIdBox'>
+                    <span class='input-group-addon fix-border'><?php echo $lang->bug->execution;?></span>
+                    <?php echo html::select('execution', $executions, $executionID, "class='form-control chosen' onchange='loadExecutionRelated(this.value)'");?>
+                  </div>
                 </div>
             </td>
             <?php endif;?>
@@ -322,6 +325,7 @@ js::set('oldProjectID', $projectID);
   </div>
 </div>
 <?php js::set('bugModule', $lang->bug->module);?>
+<?php js::set('bugExecution', $lang->bug->execution);?>
 <script>
 $(function(){parent.$('body.hide-modal-close').removeClass('hide-modal-close');})
 </script>