From 27b6817c2cc800bb2701ae4cda1c5c69213b70a5 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Thu, 14 Apr 2022 17:11:36 +0800
Subject: [PATCH] * Fix bug #17551.

---
 module/project/css/create.css       |  3 +--
 module/project/js/create.js         |  1 -
 module/project/view/create.html.php | 10 ++++------
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/module/project/css/create.css b/module/project/css/create.css
index a72bc0cafb..f06cab4405 100644
--- a/module/project/css/create.css
+++ b/module/project/css/create.css
@@ -15,5 +15,4 @@
 #productsBox a {border-radius: 2px !important;}
 #productsBox .addProduct {padding-left: 0px !important;}
 #productsBox > .required:after{right: -6px !important;}
-#productsBox .productTip {width: 80px; position: absolute; left: 350px; bottom: 6px;}
-#productsBox .required > .productTip {left: 360px;}
+#productsBox .input-group-addon > div {display: inline-block !important;}
diff --git a/module/project/js/create.js b/module/project/js/create.js
index 9c44afbbac..048c9456a2 100644
--- a/module/project/js/create.js
+++ b/module/project/js/create.js
@@ -177,7 +177,6 @@ function loadBranches(product, branchID)
         var length = $('#productsBox .row .input-group').size();
         var $html  = $('#productsBox .row .col-sm-4:last').html();
         $('#productsBox .row .col-sm-4:last').find('.input-group-addon').remove();
-        $('#productsBox .row .productTip').remove();
         $('#productsBox .row').append('<div class="col-sm-4">' + $html + '</div>');
         if($('#productsBox .row .input-group:last select').size() >= 2) $('#productsBox .row .input-group:last select:last').remove();
         $('#productsBox .row .input-group:last .chosen-container').remove();
diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php
index fa76bf3832..502c307ad0 100644
--- a/module/project/view/create.html.php
+++ b/module/project/view/create.html.php
@@ -123,14 +123,12 @@
                 <div class='input-group'>
                   <?php echo html::select("products[$i]", $allProducts, '', "class='form-control chosen' onchange='loadBranches(this)'");?>
                   <?php if(common::hasPriv('product', 'create')):?>
-                  <span class='input-group-addon'><?php echo html::checkBox('newProduct', $lang->project->addProduct, '', "onchange=addNewProduct(this);");?></span>
+                  <span class='input-group-addon'>
+                    <?php echo html::checkBox('newProduct', $lang->project->addProduct, '', "onchange=addNewProduct(this);");?>
+                    <div><icon class='icon icon-help' data-toggle='popover' data-trigger='focus hover' data-placement='top' data-tip-class='text-muted popover-sm' data-content="<?php echo $lang->project->productTip;?>"></icon></div>
+                  </span>
                   <?php endif;?>
                 </div>
-                <?php if(common::hasPriv('product', 'create')):?>
-                <div class='productTip'>
-                  <icon class='icon icon-help' data-toggle='popover' data-trigger='focus hover' data-placement='top' data-tip-class='text-muted popover-sm' data-content="<?php echo $lang->project->productTip;?>"></icon>
-                </div>
-                <?php endif;?>
               </div>
             </div>
             <div class="col-sm-4 addProduct hidden <?php if($programID) echo 'required';?>">