From adc0a47dd34ba2cc13b6a461a56e87eca35facda Mon Sep 17 00:00:00 2001
From: sunguangming <sunguangming@chandao.com>
Date: Mon, 14 Apr 2025 05:05:34 +0000
Subject: [PATCH]  * [task#141360,done,0.1h] fix bug.

---
 module/execution/js/kanban.ui.js | 2 +-
 module/kanban/tao.php            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/execution/js/kanban.ui.js b/module/execution/js/kanban.ui.js
index 53d1277a24..73200879b4 100644
--- a/module/execution/js/kanban.ui.js
+++ b/module/execution/js/kanban.ui.js
@@ -334,7 +334,7 @@ window.buildTaskActions = function(item)
     if(priv.canActivateTask && item.dbPrivs.activate && (item.status == 'developed' || item.status == 'canceled' || item.status == 'closed')) actions.push({text: executionLang.activate, icon: 'magic', url: $.createLink('task', 'activate', 'taskID=' + item.id), 'data-toggle': 'modal', 'data-size': 'lg'});
     if(priv.canCreateTask && !isLimited) actions.push({text: taskLang.copy, icon: 'copy', url: $.createLink('task', 'create', 'executionID=' + executionID + '&storyID=' + '0' + '&moduleID=' + '0' + '&taskID=' + item.id), 'data-toggle': 'modal', 'data-size': 'lg'});
     if(priv.canCancelTask && item.dbPrivs.cancel && (item.status == 'wait' || item.status == 'developing' || item.status == 'pause')) actions.push({text: taskLang.cancel, icon: 'cancel', url: $.createLink('task', 'cancel', 'taskID=' + item.id), 'data-toggle': 'modal', 'data-size': 'lg'});
-    if(priv.canDeleteTask && item.dbPrivs.delete) actions.push({text: taskLang.delete, icon: 'trash', url: $.createLink('task', 'delete', 'executionID=0&taskID=' + item.id + '&from=taskkanban'), 'data-confirm': taskLang.confirmDelete, 'innerClass': 'ajax-submit'});
+    if(priv.canDeleteTask && item.dbPrivs.delete) actions.push({text: taskLang.delete, icon: 'trash', url: $.createLink('task', 'delete', 'executionID=0&taskID=' + item.id + '&from=taskkanban'), 'data-confirm': item.isParent ? taskLang.confirmDeleteParent : taskLang.confirmDelete, 'innerClass': 'ajax-submit'});
 
     return actions;
 }
diff --git a/module/kanban/tao.php b/module/kanban/tao.php
index 41eb0c71f7..cba1559fc5 100644
--- a/module/kanban/tao.php
+++ b/module/kanban/tao.php
@@ -1092,7 +1092,7 @@ class kanbanTao extends kanbanModel
             if(common::hasPriv('task', 'batchCreate') and common::hasDBPriv($task, 'task', 'batchCreate') and $this->task->isClickable($task, 'batchCreate') and !$task->mode)                $menu['batchCreate']    = array('label' => $this->lang->task->children, 'icon' => 'split', 'url' => helper::createLink('task', 'batchCreate', "execution=$task->execution&storyID=$task->story&moduleID=$task->module&taskID=$task->id"), 'modal' => true, 'size' => 'lg');
             if(common::hasPriv('task', 'create') and common::hasDBPriv($task, 'task', 'create') and $this->task->isClickable($task, 'create'))                                                $menu['create']         = array('label' => $this->lang->task->copy, 'icon' => 'copy', 'url' => helper::createLink('task', 'create', "projctID=$task->execution&storyID=$task->story&moduleID=$task->module&taskID=$task->id"), 'modal' => true, 'size' => 'lg');
             if(common::hasPriv('task', 'cancel') and common::hasDBPriv($task, 'task', 'cancel') and $this->task->isClickable($task, 'cancel'))                                                $menu['cancel']         = array('label' => $this->lang->task->cancel, 'icon' => 'ban-circle', 'url' => helper::createLink('task', 'cancel', "taskID=$task->id&extra=from=taskkanban"), 'modal' => true, 'size' => 'lg');
-            if(common::hasPriv('task', 'delete') and common::hasDBPriv($task, 'task', 'delete'))                                                                                              $menu['delete']         = array('label' => $this->lang->task->delete, 'icon' => 'trash', 'url' => helper::createLink('task', 'delete', "executionID=$task->execution&taskID=$task->id&confirm=no&from=taskkanban"), 'confirm' => $this->lang->task->confirmDelete);
+            if(common::hasPriv('task', 'delete') and common::hasDBPriv($task, 'task', 'delete'))                                                                                              $menu['delete']         = array('label' => $this->lang->task->delete, 'icon' => 'trash', 'url' => helper::createLink('task', 'delete', "executionID=$task->execution&taskID=$task->id&confirm=no&from=taskkanban"), 'confirm' => $task->isParent ? $this->lang->task->confirmDeleteParent : $this->lang->task->confirmDelete);
 
             $menus[$task->id] = $menu;
         }