From b82a7e5f57f44cba2874a0b9653c47c5d4e8171d Mon Sep 17 00:00:00 2001 From: Zongjun Lan Date: Tue, 8 Mar 2022 09:51:34 +0800 Subject: [PATCH 1/2] * fix bug 50368 --- module/execution/js/kanban.js | 1 - module/task/model.php | 1 - 2 files changed, 2 deletions(-) diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js index 151ee611b4..629c975563 100644 --- a/module/execution/js/kanban.js +++ b/module/execution/js/kanban.js @@ -1072,7 +1072,6 @@ function createTaskMenu(options) if(priv.canRestartTask && task.$col.type == 'pause') items.push({label: taskLang.restart, icon: 'play', url: createLink('task', 'restart', 'taskID=' + task.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}}); if(priv.canPauseTask && task.$col.type == 'developing') items.push({label: taskLang.pause, icon: 'pause', url: createLink('task', 'pause', 'taskID=' + task.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}}); if(priv.canRecordEstimateTask) items.push({label: executionLang.effort, icon: 'time', url: createLink('task', 'recordEstimate', 'taskID=' + task.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}}); - if(priv.canBatchCreateTask && vision == 'lite') items.push({label: taskLang.children, icon:'split', url: $.createLink('task', 'batchcreate', 'executionID=' + executionID + '&storyID=0&moduleID=0&taskID=' + task.id, '', true), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}}); if(priv.canActivateTask && (task.$col.type == 'developed' || task.$col.type == 'canceled' || task.$col.type == 'closed')) items.push({label: executionLang.activate, icon: 'magic', url: createLink('task', 'activate', 'taskID=' + task.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}}); if(priv.canCreateTask) items.push({label: taskLang.copy, icon: 'copy', url: createLink('task', 'create', 'executionID=' + executionID + '&storyID=' + '0' + '&moduleID=' + '0' + '&taskID=' + task.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}}); if(priv.canCancelTask && (task.$col.type == 'wait' || task.$col.type == 'developing' || task.$col.type == 'pause')) items.push({label: taskLang.cancel, icon: 'cancel', url: createLink('task', 'cancel', 'taskID=' + task.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}}); diff --git a/module/task/model.php b/module/task/model.php index c6590fe6ac..b25bf7a3c8 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -3289,7 +3289,6 @@ class taskModel extends model common::printIcon('task', 'recordEstimate', "taskID=$task->id", $task, 'list', 'time', '', 'iframe', true); common::printIcon('task', 'edit', "taskID=$task->id", $task, 'list'); - common::printIcon('task', 'batchCreate', "execution=$task->execution&storyID=$task->story&moduleID=$task->module&taskID=$task->id&ifame=0", $task, 'list', 'split', '', '', '', '', $this->lang->task->children); break; } echo ''; From 64d797b109e157536380c07daa9af40d5b027d29 Mon Sep 17 00:00:00 2001 From: Zongjun Lan Date: Tue, 8 Mar 2022 15:49:39 +0800 Subject: [PATCH 2/2] * fix bug 50368 --- module/task/model.php | 1 + 1 file changed, 1 insertion(+) diff --git a/module/task/model.php b/module/task/model.php index b25bf7a3c8..96c355be80 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -3289,6 +3289,7 @@ class taskModel extends model common::printIcon('task', 'recordEstimate', "taskID=$task->id", $task, 'list', 'time', '', 'iframe', true); common::printIcon('task', 'edit', "taskID=$task->id", $task, 'list'); + if($this->config->vision == 'rnd') common::printIcon('task', 'batchCreate', "execution=$task->execution&storyID=$task->story&moduleID=$task->module&taskID=$task->id&ifame=0", $task, 'list', 'split', '', '', '', '', $this->lang->task->children); break; } echo '';