From 9491fa4a5c1f5d2cb281bc460621c845cdb05557 Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie@easycorp.ltd>
Date: Fri, 16 Jul 2021 16:33:36 +0800
Subject: [PATCH] * Ajust code.

---
 module/upgrade/js/mergeprogram.js          | 16 +++++++++++++++-
 module/upgrade/view/createprogram.html.php |  2 +-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/module/upgrade/js/mergeprogram.js b/module/upgrade/js/mergeprogram.js
index ba2e48b328..f8da5642e8 100644
--- a/module/upgrade/js/mergeprogram.js
+++ b/module/upgrade/js/mergeprogram.js
@@ -197,6 +197,7 @@ $(function()
             }
             $('[data-line=' + value + ']').prop('checked', true);
             $('[lineid=' + value + ']').addClass('active');
+            $('#programName').val($("[lineid='" + value + "']").find('a').text());
         }
         else
         {
@@ -208,6 +209,9 @@ $(function()
             }
             $('[data-line=' + value + ']').prop('checked', false);
             $('[lineid=' + value + ']').removeClass('active');
+            $('#programName').val('');
+            $('#programStatus').val('wait');
+            $('#programStatus').trigger('chosen:updated');
         }
 
         /* Determine whether all product line buttons are selected. */
@@ -287,7 +291,7 @@ $(function()
         $(target).removeClass('hidden');
 
         /* Replace program name. */
-        $('#programName').val($(this).text());
+        if($("[id^='productLines\[" + currentLine +"\]'").prop('checked')) $('#programName').val($(this).text());
 
         /* Replace project name. */
         var productID = $(target).find('.lineGroup .productList input[name*="product"]').val();
@@ -369,10 +373,17 @@ $(function()
             $('[data-product=' + value + ']').prop('checked', true)
 
             if(lineID && $('[data-lineid=' + lineID + ']').length > 0 && !$('[data-lineid=' + lineID + ']').prop('checked')) $('[data-lineid=' + lineID + ']').prop('checked', true);
+
+            $('#programName').val($("[lineid='" + lineID + "']").find('a').text());
+            $('#programStatus').val('wait');
+            $('#programStatus').trigger('chosen:updated');
         }
         else
         {
             $('[data-product=' + value + ']').prop('checked', false)
+            $('#programName').val('');
+            $('#programStatus').val('wait');
+            $('#programStatus').trigger('chosen:updated');
         }
 
         var checkedProject = true;
@@ -395,6 +406,7 @@ $(function()
 
     $('[name^=sprints]').change(function()
     {
+        var lineID = $(this).attr('data-line');
         if($(this).prop('checked'))
         {
             if(lineID && $('[data-lineid=' + lineID + ']').length > 0 && !$('[data-lineid=' + lineID + ']').prop('checked')) $('[data-lineid=' + lineID + ']').prop('checked', true);
@@ -402,6 +414,8 @@ $(function()
             var productID = $(this).attr('data-product');
             if(productID && $('[data-productid=' + productID + ']').length > 0 && !$('[data-productid=' + productID + ']').prop('checked')) $('[data-productid=' + productID + ']').prop('checked', true);
 
+
+            $('#programName').val($("[lineid='" + lineID + "']").find('a').text());
             setProgramByProduct($(':checkbox[data-productid=' + productID + ']'));
         }
 
diff --git a/module/upgrade/view/createprogram.html.php b/module/upgrade/view/createprogram.html.php
index cebcf2bc27..0b634ec16b 100644
--- a/module/upgrade/view/createprogram.html.php
+++ b/module/upgrade/view/createprogram.html.php
@@ -14,7 +14,7 @@
     <td class='required'>
       <div class='input-group'>
         <?php echo html::select("programs", $programs, $programID, "class='form-control hidden pgm-exist' onchange='getProjectByProgram(this)'");?>
-        <?php echo html::input("programName", isset($programName) ? $programName : '', "class='form-control pgm-no-exist'");?>
+        <?php echo html::input("programName", '', "class='form-control pgm-no-exist'");?>
         <span class='input-group-addon'>
           <div class="checkbox-primary">
             <input type="checkbox" name="newProgram" value="0" checked onchange="toggleProgram(this)" id="newProgram0" />