From 391ac558249379ca25506395c2d6415832410216 Mon Sep 17 00:00:00 2001
From: holan20180123 <liyuchun@easycorp.ltd>
Date: Tue, 20 Jul 2021 14:09:46 +0800
Subject: [PATCH]  * Adjust executionCommon to projectCommon when upgrade.

---
 module/custom/model.php                     | 1 +
 module/upgrade/view/mergebyline.html.php    | 2 +-
 module/upgrade/view/mergebyproduct.html.php | 2 +-
 module/upgrade/view/mergebysprint.html.php  | 2 +-
 module/upgrade/view/mergeprogram.html.php   | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/module/custom/model.php b/module/custom/model.php
index 48af012607..6b88d34694 100644
--- a/module/custom/model.php
+++ b/module/custom/model.php
@@ -691,6 +691,7 @@ class customModel extends model
     {
         $this->loadModel('setting');
         $this->setting->setItem('system.custom.sprintConcept', $this->post->sprintConcept);
+        $this->setting->setItem('system.custom.productProject', '0_' . $this->post->sprintConcept);
 
         /* Change block title. */
         $oldConfig = isset($this->config->custom->sprintConcept) ? $this->config->custom->sprintConcept : '0';
diff --git a/module/upgrade/view/mergebyline.html.php b/module/upgrade/view/mergebyline.html.php
index fbd0255a9d..a623c75001 100644
--- a/module/upgrade/view/mergebyline.html.php
+++ b/module/upgrade/view/mergebyline.html.php
@@ -35,7 +35,7 @@
           <input type='checkbox' id='checkAllProducts'><label for='checkAllProducts'><strong><?php echo $lang->productCommon;?></strong></label>
         </div>
         <div class='item checkbox-primary' title="<?php echo $lang->selectAll?>">
-          <input type='checkbox' id='checkAllProjects'><label for='checkAllProjects'><strong><?php echo $lang->executionCommon;?></strong></label>
+          <input type='checkbox' id='checkAllProjects'><label for='checkAllProjects'><strong><?php echo $lang->projectCommon;?></strong></label>
         </div>
       </div>
       <div class='line-groups'>
diff --git a/module/upgrade/view/mergebyproduct.html.php b/module/upgrade/view/mergebyproduct.html.php
index e7e9781ea4..00264ce5cf 100644
--- a/module/upgrade/view/mergebyproduct.html.php
+++ b/module/upgrade/view/mergebyproduct.html.php
@@ -16,7 +16,7 @@
           <input type='checkbox' id='checkAllProducts'><label for='checkAllProducts'><strong><?php echo $lang->productCommon;?></strong></label>
         </div>
         <div class='item checkbox-primary' title="<?php echo $lang->selectAll?>">
-          <input type='checkbox' id='checkAllProjects'><label for='checkAllProjects'><strong><?php echo $lang->executionCommon;?></strong></label>
+          <input type='checkbox' id='checkAllProjects'><label for='checkAllProjects'><strong><?php echo $lang->projectCommon;?></strong></label>
         </div>
       </div>
       <div class='line-groups'>
diff --git a/module/upgrade/view/mergebysprint.html.php b/module/upgrade/view/mergebysprint.html.php
index 38540ca6d6..cb76631ebf 100644
--- a/module/upgrade/view/mergebysprint.html.php
+++ b/module/upgrade/view/mergebysprint.html.php
@@ -9,7 +9,7 @@
     <div class='cell'>
       <div class='lineGroup-title'>
         <div class='item checkbox-primary' title="<?php echo $lang->selectAll?>">
-          <input type='checkbox' id='checkAllProjects'><label for='checkAllProjects'><strong><?php echo $lang->executionCommon;?></strong></label>
+          <input type='checkbox' id='checkAllProjects'><label for='checkAllProjects'><strong><?php echo $lang->projectCommon;?></strong></label>
         </div>
       </div>
       <div class='line-groups sprintGroup'>
diff --git a/module/upgrade/view/mergeprogram.html.php b/module/upgrade/view/mergeprogram.html.php
index decaf826c6..71b65cd015 100644
--- a/module/upgrade/view/mergeprogram.html.php
+++ b/module/upgrade/view/mergeprogram.html.php
@@ -35,7 +35,7 @@
         <table class='table table-hover table-form'>
           <thead>
             <tr>
-              <th><?php echo $lang->executionCommon;?></th>
+              <th><?php echo $lang->projectCommon;?></th>
               <th class='divider'></th>
               <th class='w-p50'><?php echo $lang->upgrade->selectProject;?></th>
             </tr>