From 6219e2323b4b8e53cd95c2616b67e9d2ed67181b Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Wed, 8 Dec 2021 11:11:12 +0800
Subject: [PATCH] * Fix bug #17208.

---
 module/upgrade/js/mergeprogram.js | 3 +--
 module/upgrade/model.php          | 6 ++++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/module/upgrade/js/mergeprogram.js b/module/upgrade/js/mergeprogram.js
index dde8bc3f65..133e75e72b 100644
--- a/module/upgrade/js/mergeprogram.js
+++ b/module/upgrade/js/mergeprogram.js
@@ -648,7 +648,7 @@ function toggleProgram(obj)
         $programs.attr('disabled', 'disabled');
         $('.programStatus').show();
         $('#programStatus').val('wait');
-        $('#programStatus').removeAttr('disabled').trigger("chosen:updated");
+        $('#programStatus').trigger("chosen:updated");
 
         $('form #newProject0').prop('checked', true);
         $('form #newLine0').prop('checked', true);
@@ -660,7 +660,6 @@ function toggleProgram(obj)
         $('form .pgm-exist').removeClass('hidden');
         $('form .pgm-no-exist').addClass('hidden');
         $('.programStatus').hide();
-        $('#programStatus').attr('disabled', 'disabled');
 
         if(!$('#newProgram0').prop('disabled'))
         {
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 8293c4e4f9..69bbef0ccd 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -4369,6 +4369,12 @@ class upgradeModel extends model
             $this->loadModel('action')->create('program', $programID, 'openedbysystem');
             if($data->programStatus == 'closed') $this->loadModel('action')->create('program', $programID, 'closedbysystem');
         }
+        else
+        {
+            $programID = $data->programID ? $data->programID : $data->programs;
+            $this->dao->update(TABLE_PROGRAM)->set('status')->eq($data->programStatus)->where('id')->eq($programID)->exec();
+            if($data->programStatus == 'closed') $this->loadModel('action')->create('program', $programID, 'openedbysystem');
+        }
 
         if(isset($data->newLine))
         {