From a730cc7d71dc06100d663942d41ebcfaa8a8f29c Mon Sep 17 00:00:00 2001
From: wangyuting <wangyuting@easycorp.ltd>
Date: Tue, 5 Mar 2024 13:58:46 +0800
Subject: [PATCH] * Fix delete project kanban locate bug. bug #46515.

---
 module/execution/control.php      |  7 ++++++-
 module/project/js/common.ui.js    | 17 +++++++++++++++++
 module/project/js/execution.ui.js | 17 -----------------
 module/project/ui/index.html.php  |  5 +++--
 4 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index 4b78fb32bf..e90594db66 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -2041,7 +2041,12 @@ class execution extends control
             if($message) $this->lang->saveSuccess = $message;
 
             if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess));
-            return $this->send(array('result' => 'success', 'load' => $execution->type == 'kanban' ? $this->createLink('execution', 'all') : true));
+            $locate = true;
+            if($execution->type == 'kanban')
+            {
+                $locate = $this->config->vision == 'lite' ? $this->createLink('project', 'execution', "status=all&projectID=$execution->project") : $this->createLink('execution', 'all');
+            }
+            return $this->send(array('result' => 'success', 'load' => $locate));
         }
     }
 
diff --git a/module/project/js/common.ui.js b/module/project/js/common.ui.js
index 2c65c82951..f55237ff4d 100644
--- a/module/project/js/common.ui.js
+++ b/module/project/js/common.ui.js
@@ -333,3 +333,20 @@ window.getDateMenu = function()
     }
     return endMenu;
 }
+
+/**
+ * 提示并删除执行。
+ * Delete execution with tips.
+ *
+ * @param  int    executionID
+ * @param  string executionName
+ * @access public
+ * @return void
+ */
+window.confirmDeleteExecution = function(executionID, confirmDeleteTip)
+{
+    zui.Modal.confirm({message: confirmDeleteTip, icon:'icon-exclamation-sign', iconClass: 'warning-pale rounded-full icon-2x'}).then((res) =>
+    {
+        if(res) $.ajaxSubmit({url: $.createLink('execution', 'delete', 'executionID=' + executionID + '&comfirm=yes')});
+    });
+}
diff --git a/module/project/js/execution.ui.js b/module/project/js/execution.ui.js
index 19539861c4..5bde0351d6 100644
--- a/module/project/js/execution.ui.js
+++ b/module/project/js/execution.ui.js
@@ -26,23 +26,6 @@ $(document).off('click','.batch-btn').on('click', '.batch-btn', function()
     }
 });
 
-/**
- * 提示并删除执行。
- * Delete execution with tips.
- *
- * @param  int    executionID
- * @param  string executionName
- * @access public
- * @return void
- */
-window.confirmDeleteExecution = function(executionID, confirmDeleteTip)
-{
-    zui.Modal.confirm({message: confirmDeleteTip, icon:'icon-exclamation-sign', iconClass: 'warning-pale rounded-full icon-2x'}).then((res) =>
-    {
-        if(res) $.ajaxSubmit({url: $.createLink('execution', 'delete', 'executionID=' + executionID + '&comfirm=yes')});
-    });
-}
-
 const today = zui.formatDate(new Date(), 'yyyy-MM-dd');
 window.onRenderCell = function(result, {col, row})
 {
diff --git a/module/project/ui/index.html.php b/module/project/ui/index.html.php
index 192e7c7341..266d561b7a 100644
--- a/module/project/ui/index.html.php
+++ b/module/project/ui/index.html.php
@@ -84,8 +84,9 @@ if(!empty($kanbanList))
             }
             elseif($action == 'delete')
             {
-                $actionItem['text'] = $lang->delete;
-                $actionItem['hint'] = $lang->delete;
+                $actionItem['text']       = $lang->delete;
+                $actionItem['hint']       = $lang->delete;
+                $actionItem['innerClass'] = $actionItem['className'];
             }
 
             $actionItems[] = $actionItem;