From 1d4a337af8a65877c7fbf8daa2923494d6f63f48 Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Tue, 22 Nov 2022 16:49:32 +0800
Subject: [PATCH] * Fix Task #77262

---
 extension/lite/kanban/ext/view/view.lite.html.hook.php | 2 +-
 module/execution/control.php                           | 2 +-
 module/execution/model.php                             | 6 +++---
 module/programplan/model.php                           | 6 +++---
 module/story/control.php                               | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/extension/lite/kanban/ext/view/view.lite.html.hook.php b/extension/lite/kanban/ext/view/view.lite.html.hook.php
index 937d1706cf..b26a53e194 100644
--- a/extension/lite/kanban/ext/view/view.lite.html.hook.php
+++ b/extension/lite/kanban/ext/view/view.lite.html.hook.php
@@ -1,5 +1,5 @@
 <script>
-<?php ;if(trim($config->visions, ',') == 'lite'): ?>
+<?php if(trim($config->visions, ',') == 'lite'): ?>
 $('#headerActions').css("right", '140px');
 <?php else: ?>
 $('#headerActions').css("right", '235px');
diff --git a/module/execution/control.php b/module/execution/control.php
index 0119d2273d..6c75eb573b 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -2129,7 +2129,7 @@ class execution extends control
         }
 
         /* Set custom. */
-        foreach(explode(',', $this->config->execution->customBatchEditFields) as $field) $customFields[$field] = $this->lang->execution->$field;
+        foreach(explode(',', $this->config->execution->customBatchEditFields) as $field) $customFields[$field] = str_replace($this->lang->executionCommon, $this->lang->execution->common, $this->lang->execution->$field);
         $this->view->customFields = $customFields;
         $this->view->showFields   = $this->config->execution->custom->batchEditFields;
 
diff --git a/module/execution/model.php b/module/execution/model.php
index fcd52fd0bc..03e57902cd 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -566,8 +566,8 @@ class executionModel extends model
             if($oldExecution->type == 'stage' and $field == 'name') $this->lang->project->name = str_replace($this->lang->executionCommon, $this->lang->project->stage, $this->lang->project->name);
         }
 
-        $relationExecutionsID = $this->getRelatedExecutions($executionID);
-        $relationExecutionsID = !empty($relationExecutionsID) ? implode(',', array_keys($relationExecutionsID)) : '';
+        $relatedExecutionsID = $this->getRelatedExecutions($executionID);
+        $relatedExecutionsID = !empty($relatedExecutionsID) ? implode(',', array_keys($relatedExecutionsID)) : '';
 
         /* Update data. */
         $this->lang->error->unique = $this->lang->error->repeat;
@@ -578,7 +578,7 @@ class executionModel extends model
             ->checkIF($execution->begin != '', 'begin', 'date')
             ->checkIF($execution->end != '', 'end', 'date')
             ->checkIF($execution->end != '', 'end', 'ge', $execution->begin)
-            ->checkIF(!empty($execution->name), 'name', 'unique', "id in ('$relationExecutionsID') and type in ('sprint','stage', 'kanban') and `project` = $executionProject and `deleted` = '0'")
+            ->checkIF(!empty($execution->name), 'name', 'unique', "id in ('$relatedExecutionsID') and type in ('sprint','stage', 'kanban') and `project` = $executionProject and `deleted` = '0'")
             ->checkIF(!empty($execution->code), 'code', 'unique', "id != $executionID and type in ('sprint','stage', 'kanban') and `deleted` = '0'")
             ->checkFlow()
             ->where('id')->eq($executionID)
diff --git a/module/programplan/model.php b/module/programplan/model.php
index bd0faad21f..c68c38571f 100755
--- a/module/programplan/model.php
+++ b/module/programplan/model.php
@@ -1086,15 +1086,15 @@ class programplanModel extends model
         $this->lang->project->name = $this->lang->programplan->name;
         $this->lang->project->code = $this->lang->execution->code;
 
-        $relationExecutionsID = $this->loadModel('execution')->getRelatedExecutions($planID);
-        $relationExecutionsID = !empty($relationExecutionsID) ? implode(',', array_keys($relationExecutionsID)) : '';
+        $relatedExecutionsID = $this->loadModel('execution')->getRelatedExecutions($planID);
+        $relatedExecutionsID = !empty($relatedExecutionsID) ? implode(',', array_keys($relatedExecutionsID)) : '';
 
         $this->dao->update(TABLE_PROJECT)->data($plan)
             ->autoCheck()
             ->batchCheck($this->config->programplan->edit->requiredFields, 'notempty')
             ->checkIF($plan->end != '0000-00-00', 'end', 'ge', $plan->begin)
             ->checkIF($plan->percent != false, 'percent', 'float')
-            ->checkIF(!empty($plan->name), 'name', 'unique', "id in ('{$relationExecutionsID}') and type in ('sprint','stage') and `project` = {$oldPlan->project} and `deleted` = '0'" . ($parentStage ? " and `parent` = {$oldPlan->parent}" : ''))
+            ->checkIF(!empty($plan->name), 'name', 'unique', "id in ('{$relatedExecutionsID}') and type in ('sprint','stage') and `project` = {$oldPlan->project} and `deleted` = '0'" . ($parentStage ? " and `parent` = {$oldPlan->parent}" : ''))
             ->checkIF(!empty($plan->code) and $setCode, 'code', 'unique', "id != $planID and type in ('sprint','stage','kanban') and `deleted` = '0'")
             ->where('id')->eq($planID)
             ->exec();
diff --git a/module/story/control.php b/module/story/control.php
index 7329f3fa4e..eb011327be 100755
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -2015,7 +2015,7 @@ class story extends control
      */
     public function batchToTask($executionID = 0, $projectID = 0)
     {
-        if($executionID) $this->loadModel('execution')->setMenu($executionID);
+        if($this->app->tab == 'execution' and $executionID) $this->loadModel('execution')->setMenu($executionID);
 
         if(!empty($_POST['name']))
         {