From eb71ea3d2da7ace081910b43ca32e8af559f3c21 Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Fri, 14 Jan 2022 13:35:35 +0800
Subject: [PATCH] * Fix the bugs of upgrade.

---
 module/execution/control.php      | 3 +--
 module/upgrade/js/mergeprogram.js | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index a4f703d5b6..f4bb2ebc00 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -24,7 +24,7 @@ class execution extends control
      * @var string
      * @access public
      */
-    public $objectType;
+    public $objectType = 'execution';
 
     /**
      * Construct function, Set executions.
@@ -47,7 +47,6 @@ class execution extends control
         {
             if(!$this->executions and $this->methodName != 'index' and $this->methodName != 'create' and $this->app->getViewType() != 'mhtml') $this->locate($this->createLink('execution', 'create'));
         }
-        $this->objectType = $this->config->systemMode == 'classic' ? 'project' : 'execution';
     }
 
     /**
diff --git a/module/upgrade/js/mergeprogram.js b/module/upgrade/js/mergeprogram.js
index 133e75e72b..6c5641da4f 100644
--- a/module/upgrade/js/mergeprogram.js
+++ b/module/upgrade/js/mergeprogram.js
@@ -818,6 +818,8 @@ function hiddenProject()
  */
 function setProgramByProduct(product)
 {
+    if(product.length == 0) return;
+
     var programID = product.attr('data-programid');
     $(':checkbox[data-productid]').each(function()
     {