From 8490bf7dbfa5a4724179ede772c93958f9acc274 Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Wed, 21 Sep 2022 01:12:39 +0000
Subject: [PATCH]  * Rename noExecution to noSprint.  * Optimize codes.

---
 module/block/lang/de.php                      |  4 ++--
 module/block/lang/en.php                      |  4 ++--
 module/block/lang/fr.php                      |  4 ++--
 module/block/lang/zh-cn.php                   |  4 ++--
 module/block/model.php                        |  2 +-
 module/bug/view/create.html.php               |  4 ++--
 module/common/lang/menu.php                   |  8 ++++----
 module/common/model.php                       |  4 ++--
 module/group/view/manageprojectadmin.html.php |  6 +++---
 module/project/model.php                      | 14 +++++---------
 module/upgrade/model.php                      |  6 +++---
 11 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/module/block/lang/de.php b/module/block/lang/de.php
index 655c4df0de..6f30292284 100644
--- a/module/block/lang/de.php
+++ b/module/block/lang/de.php
@@ -322,7 +322,7 @@ $lang->block->default['full']['my']['10']['title']  = 'Project List';
 $lang->block->default['full']['my']['10']['block']  = 'project';
 $lang->block->default['full']['my']['10']['source'] = 'project';
 $lang->block->default['full']['my']['10']['grid']   = 8;
-if(!isset($config->projectMode) || $config->projectMode != 'noExecution')
+if(!isset($config->projectMode) || $config->projectMode != 'noSprint')
 {
     $lang->block->default['full']['my']['10']['block']  = 'project';
     $lang->block->default['full']['my']['10']['source'] = 'project';
@@ -355,7 +355,7 @@ $lang->block->availableBlocks->feedback    = 'My Feedbacks';
 
 $lang->block->moduleList['product'] = $lang->productCommon;
 $lang->block->moduleList['project'] = 'Project';
-if(!isset($config->projectMode) || $config->projectMode != 'noExecution') $lang->block->moduleList['execution'] = $lang->execution->common;
+if(!isset($config->projectMode) || $config->projectMode != 'noSprint') $lang->block->moduleList['execution'] = $lang->execution->common;
 $lang->block->moduleList['qa']      = 'QA';
 $lang->block->moduleList['todo']    = 'Todos';
 
diff --git a/module/block/lang/en.php b/module/block/lang/en.php
index 214b1fd45f..b085a9443e 100644
--- a/module/block/lang/en.php
+++ b/module/block/lang/en.php
@@ -322,7 +322,7 @@ $lang->block->default['full']['my']['10']['title']  = 'Project List';
 $lang->block->default['full']['my']['10']['block']  = 'project';
 $lang->block->default['full']['my']['10']['source'] = 'project';
 $lang->block->default['full']['my']['10']['grid']   = 8;
-if(!isset($config->projectMode) || $config->projectMode != 'noExecution')
+if(!isset($config->projectMode) || $config->projectMode != 'noSprint')
 {
     $lang->block->default['full']['my']['10']['block']  = 'execution';
     $lang->block->default['full']['my']['10']['source'] = 'execution';
@@ -355,7 +355,7 @@ $lang->block->availableBlocks->feedback    = 'My Feedbacks';
 
 $lang->block->moduleList['product'] = $lang->productCommon;
 $lang->block->moduleList['project'] = 'Project';
-if(!isset($config->projectMode) || $config->projectMode != 'noExecution') $lang->block->moduleList['execution'] = $lang->execution->common;
+if(!isset($config->projectMode) || $config->projectMode != 'noSprint') $lang->block->moduleList['execution'] = $lang->execution->common;
 $lang->block->moduleList['qa']      = 'Test';
 $lang->block->moduleList['todo']    = 'Todo';
 
diff --git a/module/block/lang/fr.php b/module/block/lang/fr.php
index d0e712551e..9b6c1e8db1 100644
--- a/module/block/lang/fr.php
+++ b/module/block/lang/fr.php
@@ -322,7 +322,7 @@ $lang->block->default['full']['my']['10']['title']  = 'Project List';
 $lang->block->default['full']['my']['10']['block']  = 'project';
 $lang->block->default['full']['my']['10']['source'] = 'project';
 $lang->block->default['full']['my']['10']['grid']   = 8;
-if(!isset($config->projectMode) || $config->projectMode != 'noExecution')
+if(!isset($config->projectMode) || $config->projectMode != 'noSprint')
 {
     $lang->block->default['full']['my']['10']['block']  = 'project';
     $lang->block->default['full']['my']['10']['source'] = 'project';
@@ -355,7 +355,7 @@ $lang->block->availableBlocks->feedback    = 'My Feedbacks';
 
 $lang->block->moduleList['product'] = $lang->productCommon;
 $lang->block->moduleList['project'] = 'Project';
-if(!isset($config->projectMode) || $config->projectMode != 'noExecution') $lang->block->moduleList['execution'] = $lang->execution->common;
+if(!isset($config->projectMode) || $config->projectMode != 'noSprint') $lang->block->moduleList['execution'] = $lang->execution->common;
 $lang->block->moduleList['qa']      = 'Test';
 $lang->block->moduleList['todo']    = 'Todo';
 
diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php
index 2e5712c535..2a4ac76a7a 100644
--- a/module/block/lang/zh-cn.php
+++ b/module/block/lang/zh-cn.php
@@ -322,7 +322,7 @@ $lang->block->default['full']['my']['10']['title']  = '项目列表';
 $lang->block->default['full']['my']['10']['block']  = 'project';
 $lang->block->default['full']['my']['10']['source'] = 'project';
 $lang->block->default['full']['my']['10']['grid']   = 8;
-if(!isset($config->projectMode) || $config->projectMode != 'noExecution')
+if(!isset($config->projectMode) || $config->projectMode != 'noSprint')
 {
     $lang->block->default['full']['my']['10']['block']  = 'execution';
     $lang->block->default['full']['my']['10']['source'] = 'execution';
@@ -355,7 +355,7 @@ $lang->block->availableBlocks->feedback    = '反馈';
 
 $lang->block->moduleList['product'] = $lang->productCommon;
 $lang->block->moduleList['project'] = '项目';
-if(!isset($config->projectMode) || $config->projectMode != 'noExecution') $lang->block->moduleList['execution'] = $lang->execution->common;
+if(!isset($config->projectMode) || $config->projectMode != 'noSprint') $lang->block->moduleList['execution'] = $lang->execution->common;
 $lang->block->moduleList['qa']      = '测试';
 $lang->block->moduleList['todo']    = '待办';
 
diff --git a/module/block/model.php b/module/block/model.php
index 3d3f6aeaff..29a9538e3e 100644
--- a/module/block/model.php
+++ b/module/block/model.php
@@ -137,7 +137,7 @@ class blockModel extends model
             ->andWhere('vision')->eq($this->config->vision)
             ->andWhere('hidden')->eq(0)
             ->beginIF($type)->andWhere('type')->eq($type)->fi()
-            ->beginIF(isset($this->config->projectMode) && $this->config->projectMode == 'noExecution')->andWhere('source')->ne('execution')->fi()
+            ->beginIF(isset($this->config->projectMode) && $this->config->projectMode == 'noSprint')->andWhere('source')->ne('execution')->fi()
             ->orderBy('`order`')
             ->fetchAll('id');
     }
diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index e385e28e06..418c3668fa 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -78,7 +78,7 @@ if($this->app->tab == 'project')   js::set('objectID', $projectID);
             </td>
           </tr>
           <?php $showExecution = (strpos(",$showFields,", ',execution,') !== false);?>
-          <?php $noExecution   = (isset($config->projectMode) and $config->projectMode == 'noExecution');?>
+          <?php $noSprint      = (isset($config->projectMode) and $config->projectMode == 'noSprint');?>
           <tr>
             <th>
               <?php echo ($showExecution) ? $lang->bug->project : $lang->bug->type;?>
@@ -111,7 +111,7 @@ if($this->app->tab == 'project')   js::set('objectID', $projectID);
             <?php endif;?>
             <?php if($showExecution):?>
             <td>
-              <?php if(!$noExecution):?>
+              <?php if(!$noSprint):?>
               <div class='table-row'>
                 <div class='table-col' id='projectBox'>
                   <?php echo html::select('project', $projects, $projectID, "class='form-control chosen' onchange='loadProductExecutions({$productID}, this.value)'");?>
diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index 174f0b54e2..bf91f22500 100644
--- a/module/common/lang/menu.php
+++ b/module/common/lang/menu.php
@@ -62,7 +62,7 @@ $lang->mainNav->menuOrder[55] = 'system';
 $lang->mainNav->menuOrder[60] = 'admin';
 
 if($config->systemMode == 'lean') unset($lang->mainNav->program, $lang->mainNav->menuOrder[10]);
-if(isset($config->projectMode) and $config->projectMode == 'noExecution') unset($lang->mainNav->execution, $lang->mainNav->menuOrder[25]);
+if(isset($config->projectMode) and $config->projectMode == 'noSprint') unset($lang->mainNav->execution, $lang->mainNav->menuOrder[25]);
 
 /* My menu. */
 $lang->my->menu             = new stdclass();
@@ -89,7 +89,7 @@ $lang->my->menuOrder[45] = 'score';
 $lang->my->menuOrder[50] = 'contacts';
 
 if(!$config->systemScore) unset($lang->my->menu->score, $lang->my->menuOrder[45]);
-if(isset($config->projectMode) and $config->projectMode == 'noExecution') unset($lang->my->menu->execution, $lang->my->menuOrder[30]);
+if(isset($config->projectMode) and $config->projectMode == 'noSprint') unset($lang->my->menu->execution, $lang->my->menuOrder[30]);
 
 $lang->my->menu->work['subMenu']              = new stdclass();
 $lang->my->menu->work['subMenu']->task        = array('link' => "{$lang->task->common}|my|work|mode=task", 'subModule' => 'task');
@@ -488,13 +488,13 @@ $lang->doc->menuOrder[30] = 'project';
 $lang->doc->menuOrder[35] = 'execution';
 $lang->doc->menuOrder[36] = 'api';
 $lang->doc->menuOrder[40] = 'custom';
-if(isset($config->projectMode) and $config->projectMode == 'noExecution') unset($lang->doc->menu->execution, $lang->doc->menuOrder[35]);
+if(isset($config->projectMode) and $config->projectMode == 'noSprint') unset($lang->doc->menu->execution, $lang->doc->menuOrder[35]);
 
 $lang->doc->menu->product['subMenu']   = new stdclass();
 $lang->doc->menu->project['subMenu']   = new stdclass();
 $lang->doc->menu->execution['subMenu'] = new stdclass();
 $lang->doc->menu->custom['subMenu']    = new stdclass();
-if(isset($config->projectMode) and $config->projectMode == 'noExecution') unset($lang->doc->menu->execution['subMenu']);
+if(isset($config->projectMode) and $config->projectMode == 'noSprint') unset($lang->doc->menu->execution['subMenu']);
 
 $lang->doc->menu->api['subMenu'] = new stdclass();
 $lang->doc->menu->api['subMenu']->index  = array('link' => "{$lang->doc->apiDoc}|api|index|libID=%s", 'alias' => 'create,edit');
diff --git a/module/common/model.php b/module/common/model.php
index 60bdd68bd0..bfc9312ab0 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -613,7 +613,7 @@ class commonModel extends model
 
         if($config->edition == 'open')   unset($lang->createIcons['effort']);
         if($config->systemMode != 'new') unset($lang->createIcons['program']);
-        if(!isset($config->projectMode) || $config->projectMode == 'noExecution') unset($lang->createIcons['execution']);
+        if(!isset($config->projectMode) || $config->projectMode == 'noSprint') unset($lang->createIcons['execution']);
 
         /* Check whether the creation permission is available, and print create buttons. */
 
@@ -1240,7 +1240,7 @@ class commonModel extends model
 
         $searchObjects = $lang->searchObjects;
         if($config->systemMode != 'new') unset($searchObjects['program']);
-        if(!isset($config->projectMode) || $config->projectMode == 'noExecution') unset($searchObjects['execution']);
+        if(!isset($config->projectMode) || $config->projectMode == 'noSprint') unset($searchObjects['execution']);
 
         foreach($searchObjects as $key => $value)
         {
diff --git a/module/group/view/manageprojectadmin.html.php b/module/group/view/manageprojectadmin.html.php
index 1523a76f7e..5fce996e72 100644
--- a/module/group/view/manageprojectadmin.html.php
+++ b/module/group/view/manageprojectadmin.html.php
@@ -43,7 +43,7 @@
           </tr>
           <?php $hiddenProgram = $config->systemMode == 'new' ? '' : 'hidden';?>
           <?php $rowspan       = $config->systemMode == 'new' ? 4 : 3;?>
-          <?php $noExecution   = (isset($config->projectMode) and $config->projectMode == 'noExecution');?>
+          <?php $noSprint      = (isset($config->projectMode) and $config->projectMode == 'noSprint');?>
           <?php if($projectAdmins):?>
           <?php foreach($projectAdmins as $account => $group):?>
           <tr class="line<?php echo $group->group;?>">
@@ -104,7 +104,7 @@
               <?php echo html::checkbox("productAll[$group->group]", array(1 => ''), $group->products == 'all' ? 1 : '', "onchange=toggleDisabled(this);");?>
             </td>
           </tr>
-          <?php if(!$noExecution):?>
+          <?php if(!$noSprint):?>
           <tr class="line<?php echo $group->group;?>">
             <td>
               <div class='input-group'>
@@ -173,7 +173,7 @@
               <?php echo html::checkbox('productAll[1]', array(1 => ''), '', "onchange=toggleDisabled(this);");?>
             </td>
           </tr>
-          <?php if(!$noExecution):?>
+          <?php if(!$noSprint):?>
           <tr class='line1'>
             <td>
               <div class='input-group'>
diff --git a/module/project/model.php b/module/project/model.php
index 867448ffd8..ba83cafc12 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -2493,29 +2493,25 @@ class projectModel extends model
         $this->config->resetNavGroup['execution'] = 'execution';
         $this->config->resetNavGroup[$moduleName] = $navGroup;
 
-        $project = $this->dao->select('*')->from(TABLE_PROJECT)->where('id')->eq($objectID)->andWhere('noSprint')->eq(1)->fetch();
+        $project = $this->dao->select('*')->from(TABLE_PROJECT)->where('id')->eq($objectID)->andWhere('noSprint')->eq('1')->fetch();
         if(empty($project)) return;
+
         if($project->type != 'project' and $project->type != 'sprint') return;
 
         if($project->type == 'project')
         {
             $projectID   = $project->id;
-            $executionID = $this->dao->select('*')->from(TABLE_EXECUTION)
+            $executionID = $this->dao->select('id')->from(TABLE_EXECUTION)
                 ->where('project')->eq($projectID)
                 ->andWhere('noSprint')->eq(1)
                 ->andWhere('type')->eq('sprint')
-                ->andWhere('deleted')->eq(0)
+                ->andWhere('deleted')->eq('0')
                 ->fetch('id');
         }
         elseif($project->type == 'sprint')
         {
             $executionID = $project->id;
-            $projectID   = $this->dao->select('*')->from(TABLE_PROJECT)
-                ->where('id')->eq($project->project)
-                ->andWhere('noSprint')->eq(1)
-                ->andWhere('type')->eq('project')
-                ->andWhere('deleted')->eq(0)
-                ->fetch('id');
+            $projectID   = $project->project;
         }
         if(empty($projectID) or empty($executionID)) return;
 
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 14d6d0916d..d9a09635b7 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -7538,8 +7538,8 @@ class upgradeModel extends model
      */
     public function classic2Lean($programID)
     {
-        /* Set project mode as noExecution. */
-        $this->loadModel('setting')->setItem('system.common.global.projectMode', 'noExecution');
+        /* Set project mode as noSprint. */
+        $this->loadModel('setting')->setItem('system.common.global.projectMode', 'noSprint');
 
         $this->upgradeInProjectMode($programID);
 
@@ -7625,7 +7625,7 @@ class upgradeModel extends model
             $project->lastEditedDate = $now;
             $project->grade          = 2;
             $project->acl            = $sprint->acl == 'open' ? 'open' : 'private';
-            if($projectMode == 'noExecution') $project->noExecution = '1';
+            if($projectMode == 'noSprint') $project->noSprint = '1';
 
             $this->dao->insert(TABLE_PROJECT)->data($project)->check('name', 'unique', "type='project' AND parent=$programID AND deleted='0'")->exec();
             if(dao::isError()) return false;