From 1bca37102ec0eb1903268531c4073b6e18347fe2 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, 6 Dec 2022 13:39:36 +0800
Subject: [PATCH] * Fix bug #30554.

---
 module/project/js/create.js | 7 +++----
 module/project/js/edit.js   | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/module/project/js/create.js b/module/project/js/create.js
index 1d1cdb8c1e..92e09db510 100644
--- a/module/project/js/create.js
+++ b/module/project/js/create.js
@@ -162,17 +162,16 @@ function setParentProgram(parentProgram)
             var productSelectHtml = data.allProducts;
             var planSelectHtml    = data.plans;
 
-            $('.productsBox .row .col-sm-4 .input-group').each(function(index)
+            $('.productsBox .row .col-sm-6 .input-group').each(function(index)
             {
                 var selectedProduct = $(this).find('[name^=products]').val();
                 var selectedBranch  = $(this).find('[name^=branch]').val();
                 var selectedPlan    = $('#plan' + index ).find('[name^=plans]').val();
 
-                $(this).html(productSelectHtml);
+                $(this).find('[name^=products]').html(productSelectHtml);
                 $(this).find('[name^=products]').attr('name', 'products[' + index + ']').attr('id', 'products' + index).attr('data-branch', selectedBranch).attr('data-plan', selectedPlan);
                 $(this).find('[name^=products]').val(selectedProduct).chosen().change();
             });
-            $('.productsBox .row .col-sm-4:last').find('.input-group').append($('.productsBox .addProduct .input-group:first .input-group-addon').prop('outerHTML'));
         }
 
         if(parentProgram != 0)
@@ -245,7 +244,7 @@ function addNewProduct(obj)
         $('.newLine').removeClass('hidden');
         $('.productsBox .row').removeClass('hidden');
         $('.productsBox .row .input-group').find('select').removeAttr('disabled').trigger("chosen:updated");
-        if($('#plansBox .col-sm-4').find('select').length > 1) $('.division').removeClass('hide');
+        if($('.productsBox').find("select[name^=products]").length > 1) $('.division').removeClass('hide');
 
         /* Hide the input box for creating a product. */
         $(obj).closest('td').attr('colspan', 3);
diff --git a/module/project/js/edit.js b/module/project/js/edit.js
index e676a6a499..d9abb1e438 100644
--- a/module/project/js/edit.js
+++ b/module/project/js/edit.js
@@ -18,13 +18,13 @@ $(function()
                 var productSelectHtml = data.allProducts;
                 var planSelectHtml    = data.plans;
 
-                $('#productsBox .row .col-sm-4 .input-group').each(function(index)
+                $('.productsBox .row .col-sm-6 .input-group').each(function(index)
                 {
                     var selectedProduct = $(this).find('[name^=products]').val();
                     var selectedBranch  = $(this).find('[name^=branch]').val();
                     var selectedPlan    = $('#plan' + index ).find('[name^=plans]').val();
 
-                    $(this).html(productSelectHtml);
+                    $(this).find('[name^=products]').html(productSelectHtml);
                     $(this).find('[name^=products]').attr('name', 'products[' + index + ']').attr('id', 'products' + index).attr('data-branch', selectedBranch).attr('data-plan', selectedPlan);
                     $(this).find('[name^=products]').val(selectedProduct).chosen().change();
                 });