From 25b54558d0baea96ac615cb537b0a2968efa7360 Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie@easycorp.ltd>
Date: Wed, 14 Jul 2021 14:15:22 +0800
Subject: [PATCH] * Adjust code.

---
 module/upgrade/js/mergeprogram.js | 9 +++++++++
 module/upgrade/model.php          | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/module/upgrade/js/mergeprogram.js b/module/upgrade/js/mergeprogram.js
index 09a4c442a3..888680cbcd 100644
--- a/module/upgrade/js/mergeprogram.js
+++ b/module/upgrade/js/mergeprogram.js
@@ -490,6 +490,15 @@ $(function()
                 return false;
             }
         })
+
+        /* If the product line is selected, the product and project are selected by default. */
+        $('[id^=productLines]').each(function()
+        {
+            if($(this).prop('checked'))
+            {
+                $('[data-line=' + $(this).val() +']').prop('checked', true);
+            }
+        })
     })
 
     $('[name^=products]').change(function()
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 7ecb09415a..22b975ee00 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -4246,7 +4246,7 @@ class upgradeModel extends model
     public function createProgram($productIdList = array(), $projectIdList = array())
     {
         $this->app->loadLang('program');
-        $data = fixer::input('post')->get();
+        $data    = fixer::input('post')->get();
         $account = isset($this->app->user->account) ? $this->app->user->account : '';
 
         if(isset($data->newProgram))