Merge branch 'sprint/tianshujie_bug23113' into 'master'

* Fix bug #23113.

See merge request easycorp/zentaopms!3754

module/upgrade/js/mergeprogram.js

@@ -573,6 +573,53 @@ $(function()
         $('[name=programAcl]').attr('disabled', 'disabled');
         $('[name=projectAcl]').removeAttr('disabled');
     }
+
+    $('#submit').click(function()
+    {
+        if(type == 'productline')
+        {
+            var checkedProductCount = $("input[name^='products']:checked").length;
+            if(checkedProductCount <= 0)
+            {
+                alert(errorNoProduct);
+                return false;
+            }
+        }
+        else if(type == 'product')
+        {
+            var checkedProductCount = $("input[name^='products']:checked").length;
+            if(checkedProductCount <= 0)
+            {
+                alert(errorNoProduct);
+                return false;
+            }
+
+            var executionCount        = 0;
+            var checkedExecutionCount = 0;
+            $("input[name^='products']:checked").each(function()
+            {
+                var productID = $(this).val()
+
+                executionCount        += $("[data-product='" + productID + "']").length;
+                checkedExecutionCount += $("[data-product='" + productID + "']:checked").length;
+            });
+
+            if(executionCount !== 0 && checkedExecutionCount === 0)
+            {
+                alert(errorNoExecution);
+                return false;
+            }
+        }
+        else
+        {
+            var checkedExecutionCount = $("input[name^='sprints']:checked").length;
+            if(checkedExecutionCount === 0)
+            {
+                alert(errorNoExecution);
+                return false;
+            }
+        }
+    })
 });
 
 /**

module/upgrade/lang/en.php

@@ -134,6 +134,8 @@ $lang->upgrade->duplicateProject   = "Project name in the same program cannot be
 $lang->upgrade->upgradeTips        = "Historically deleted data cannot be upgraded, and restoration is not supported after the upgrade. Please be aware.";
 $lang->upgrade->moveEXTFileFail    = 'The migration file failed, please execute the above command and refresh!';
 $lang->upgrade->deleteDirTip       = 'After the upgrade, the following folders will affect the use of system functions, please delete them.';
+$lang->upgrade->errorNoProduct     = "Select the {$lang->productCommon} that you want to merge.";
+$lang->upgrade->errorNoExecution   = "Select the {$lang->projectCommon} that you want to merge.";
 $lang->upgrade->moveExtFileTip     = <<<EOT
 <p>The new version will be compatible with the extension mechanism of the historical customization/plug-in. You need to migrate the customization/plug-in related files to extension/custom, otherwise the customization/plug-in function will not be available.</p>
 <p>Please confirm whether the system has been customized/plug-in. If no customization/plug-in has been done, you can uncheck the following files; Whether you have done customization/plug-in, you can also keep the file checked.</p>

module/upgrade/lang/zh-cn.php

@@ -134,6 +134,8 @@ $lang->upgrade->duplicateProject   = "同一个项目集内项目名称不能重
 $lang->upgrade->upgradeTips        = "历史删除数据不参与升级，升级后将不支持还原，请知悉";
 $lang->upgrade->moveEXTFileFail    = '迁移文件失败， 请执行上面命令后刷新！';
 $lang->upgrade->deleteDirTip       = '升级后，如下文件夹会影响系统功能的使用，请删除。';
+$lang->upgrade->errorNoProduct     = "请选择需要归并的{$lang->productCommon}。";
+$lang->upgrade->errorNoExecution   = "请选择需要归并的{$lang->projectCommon}。";
 $lang->upgrade->moveExtFileTip     = <<<EOT
 <p>新版本将对历史的定制/插件进行扩展机制兼容处理，需要将定制/插件相关的文件迁移到extension/custom下，否则定制/插件功能将无法使用。</p>
 <p>请您确认系统是否有做过定制/插件，如没有做过定制/插件，可取消勾选如下文件；如果不清楚是否做过定制/插件，也可保持文件勾选。</p>

module/upgrade/view/mergeprogram.html.php

@@ -13,6 +13,8 @@
 <?php include '../../common/view/header.lite.html.php';?>
 <?php js::set('weekend', $config->execution->weekend);?>
 <?php js::set('type', $type);?>
+<?php js::set('errorNoProduct', $lang->upgrade->errorNoProduct);?>
+<?php js::set('errorNoExecution', $lang->upgrade->errorNoExecution);?>
 <div class='container'>
   <form method='post' target='hiddenwin'>
     <div class='modal-dialog'>