From e8603eef32e2ff44486865cc87cbede7e30f3f5f Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Tue, 19 Jul 2022 15:25:43 +0800
Subject: [PATCH] * Finish task #61181.

---
 module/execution/config.php              | 11 +++++++----
 module/execution/model.php               |  4 ++--
 module/execution/view/batchedit.html.php | 21 ++++++++++-----------
 module/execution/view/create.html.php    |  2 ++
 module/execution/view/edit.html.php      |  2 ++
 module/execution/view/view.html.php      |  3 ++-
 6 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/module/execution/config.php b/module/execution/config.php
index 2e46428e5b..6886b721d2 100644
--- a/module/execution/config.php
+++ b/module/execution/config.php
@@ -151,10 +151,13 @@ $config->execution->datatable->fieldList['name']['fixed']    = 'left';
 $config->execution->datatable->fieldList['name']['width']    = 'auto';
 $config->execution->datatable->fieldList['name']['required'] = 'yes';
 
-$config->execution->datatable->fieldList['code']['title']    = 'code';
-$config->execution->datatable->fieldList['code']['fixed']    = 'no';
-$config->execution->datatable->fieldList['code']['width']    = '95';
-$config->execution->datatable->fieldList['code']['required'] = 'no';
+if(!isset($config->setCode) or $config->setCode == 1)
+{
+    $config->execution->datatable->fieldList['code']['title']    = 'code';
+    $config->execution->datatable->fieldList['code']['fixed']    = 'no';
+    $config->execution->datatable->fieldList['code']['width']    = '95';
+    $config->execution->datatable->fieldList['code']['required'] = 'no';
+}
 
 $config->execution->datatable->fieldList['project']['title']    = 'project';
 $config->execution->datatable->fieldList['project']['fixed']    = 'no';
diff --git a/module/execution/model.php b/module/execution/model.php
index 355ee67754..c1cd90d2fc 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -462,7 +462,7 @@ class executionModel extends model
         $oldExecution = $this->dao->findById($executionID)->from(TABLE_EXECUTION)->fetch();
 
         /* Judgment of required items. */
-        if($oldExecution->type != 'stage' and $this->post->code == '')
+        if($oldExecution->type != 'stage' and $this->post->code == '' and (!isset($this->config->setCode) or $this->config->setCode == 1))
         {
             dao::$errors['code'] = sprintf($this->lang->error->notempty, $this->lang->execution->code);
             return false;
@@ -686,7 +686,7 @@ class executionModel extends model
             if($executions[$executionID]->status == 'suspended') $executions[$executionID]->suspendedDate = helper::today();
 
             /* Check unique code for edited executions. */
-            if($projectModel == 'scrum' and empty($executionCode))
+            if($projectModel == 'scrum' and empty($executionCode) and (!isset($this->config->setCode) or $this->config->setCode == 1))
             {
                 dao::$errors['code'][] = 'execution#' . $executionID .  sprintf($this->lang->error->notempty, $this->lang->project->code);
                 return false;
diff --git a/module/execution/view/batchedit.html.php b/module/execution/view/batchedit.html.php
index 260211cd5a..aa395cbe56 100755
--- a/module/execution/view/batchedit.html.php
+++ b/module/execution/view/batchedit.html.php
@@ -34,15 +34,14 @@
           if(strpos(",{$config->execution->customBatchEditFields},", ",{$field},") !== false) $visibleFields[$field] = '';
       }
   }
-  $minWidth = (count($visibleFields) > 5) ? 'w-150px' : '';
-
-  $name = $from == 'execution' ? 'execName' : 'name';
-  $code = $from == 'execution' ? 'execCode' : 'code';
-  $PM   = $from == 'execution' ? 'execPM'   : 'PM';
-  $type = $from == 'execution' ? 'execType' : 'type';
-  $desc = $from == 'execution' ? 'execDesc' : 'desc';
-  $status = $from == 'execution' ? 'execStatus' : 'status';
-
+  $minWidth   = (count($visibleFields) > 5) ? 'w-150px' : '';
+  $name       = $from == 'execution' ? 'execName' : 'name';
+  $code       = $from == 'execution' ? 'execCode' : 'code';
+  $PM         = $from == 'execution' ? 'execPM'   : 'PM';
+  $type       = $from == 'execution' ? 'execType' : 'type';
+  $desc       = $from == 'execution' ? 'execDesc' : 'desc';
+  $status     = $from == 'execution' ? 'execStatus' : 'status';
+  $hiddenCode = (isset($config->setCode) and $config->setCode == 0) ? 'hidden' : '';
   ?>
   <form class='main-form' method='post' target='hiddenwin' id='executionForm' action='<?php echo inLink('batchEdit');?>'>
     <div class="table-responsive">
@@ -54,7 +53,7 @@
             <th class='c-project required' style="width:100%"><?php echo $lang->execution->projectName;?></th>
             <?php endif;?>
             <th class='required <?php echo $minWidth?>' style="width:100%"><?php echo $lang->execution->$name;?></th>
-            <th class='c-code required'><?php echo $lang->execution->$code;?></th>
+            <th class="c-code required <?php echo $hiddenCode;?>"><?php echo $lang->execution->$code;?></th>
             <th class='c-user<?php echo zget($visibleFields, 'PM',       ' hidden') . zget($requiredFields, 'PM',     '', ' required');?>'><?php echo $lang->execution->$PM;?></th>
             <th class='c-user<?php echo zget($visibleFields, 'PO',       ' hidden') . zget($requiredFields, 'PO',     '', ' required');?>'><?php echo $lang->execution->PO;?></th>
             <th class='c-user<?php echo zget($visibleFields, 'QD',       ' hidden') . zget($requiredFields, 'QD',     '', ' required');?>'><?php echo $lang->execution->QD;?></th>
@@ -86,7 +85,7 @@
             <td class='text-left' style='overflow:visible'><?php echo html::select("projects[$executionID]", $allProjects, $executions[$executionID]->project, "class='form-control picker-select' data-lastselected='{$executions[$executionID]->project}' onchange='changeProject(this, $executionID, {$executions[$executionID]->project})'");?></td>
             <?php endif;?>
             <td title='<?php echo $executions[$executionID]->name?>'><?php echo html::input("names[$executionID]", $executions[$executionID]->name, "id='names{$executionID}' class='form-control'");?></td>
-            <td><?php echo html::input("codes[$executionID]",     $executions[$executionID]->code, "class='form-control'");?></td>
+            <td class="<?php echo $hiddenCode;?>"><?php echo html::input("codes[$executionID]",     $executions[$executionID]->code, "class='form-control'");?></td>
             <td class='text-left<?php echo zget($visibleFields, 'PM',  ' hidden')?>' style='overflow:visible'><?php echo html::select("PMs[$executionID]", $pmUsers, $executions[$executionID]->PM, "class='form-control picker-select'");?></td>
             <td class='text-left<?php echo zget($visibleFields, 'PO', ' hidden')?>' style='overflow:visible'><?php echo html::select("POs[$executionID]", $poUsers, $executions[$executionID]->PO, "class='form-control picker-select'");?></td>
             <td class='text-left<?php echo zget($visibleFields, 'QD', ' hidden')?>' style='overflow:visible'><?php echo html::select("QDs[$executionID]", $qdUsers, $executions[$executionID]->QD, "class='form-control picker-select'");?></td>
diff --git a/module/execution/view/create.html.php b/module/execution/view/create.html.php
index 18fff781b3..2d4d4eff1a 100644
--- a/module/execution/view/create.html.php
+++ b/module/execution/view/create.html.php
@@ -70,10 +70,12 @@
           <td class="col-main"><?php echo html::input('name', $name, "class='form-control' required");?></td>
           <td colspan='2'></td>
         </tr>
+        <?php if(!isset($config->setCode) or $config->setCode == 1):?>
         <tr>
           <th><?php echo $showExecutionExec ? $lang->execution->execCode : $lang->execution->code;?></th>
           <td><?php echo html::input('code', $code, "class='form-control' required");?></td><td></td><td></td>
         </tr>
+        <?php endif;?>
         <tr>
           <th id='dateRange'><?php echo $lang->execution->dateRange;?></th>
           <td>
diff --git a/module/execution/view/edit.html.php b/module/execution/view/edit.html.php
index d1c59a4cf3..e8043c98f2 100644
--- a/module/execution/view/edit.html.php
+++ b/module/execution/view/edit.html.php
@@ -39,10 +39,12 @@
           <th class='w-120px'><?php echo $lang->execution->name;?></th>
           <td><?php echo html::input('name', $execution->name, "class='form-control' required");?></td><td></td>
         </tr>
+        <?php if(!isset($config->setCode) or $config->setCode == 1):?>
         <tr>
           <th><?php echo $lang->execution->code;?></th>
           <td><?php echo html::input('code', $execution->code, "class='form-control' required");?></td>
         </tr>
+        <?php endif;?>
         <tr>
           <th id="dateRange"><?php echo $lang->execution->dateRange;?></th>
           <td>
diff --git a/module/execution/view/view.html.php b/module/execution/view/view.html.php
index 719f49369c..1307ded6a8 100644
--- a/module/execution/view/view.html.php
+++ b/module/execution/view/view.html.php
@@ -158,7 +158,8 @@
         <div class="col-sm-12">
           <div class="cell">
             <div class="detail">
-              <h2 class="detail-title"><span class="label-id"><?php echo $execution->id;?></span> <span class="label label-light label-outline"><?php echo $execution->code;?></span> <?php echo $execution->name;?></h2>
+              <?php $hiddenCode = (isset($config->setCode) and $config->setCode == 0) ? 'hidden' : '';?>
+              <h2 class="detail-title"><span class="label-id"><?php echo $execution->id;?></span> <span class="label label-light label-outline <?php echo $hiddenCode;?>"><?php echo $execution->code;?></span> <?php echo $execution->name;?></h2>
               <div class="detail-content article-content">
                 <div><span class="text-limit hidden" data-limit-size="40"><?php echo $execution->desc;?></span><a class="text-primary text-limit-toggle small" data-text-expand="<?php echo $lang->expand;?>"  data-text-collapse="<?php echo $lang->collapse;?>"></a></div>
                 <p>