From e9d1a804c4dbd5d29b0f232b3ef401702ddf146e Mon Sep 17 00:00:00 2001 From: wumo Date: Thu, 22 Mar 2018 23:18:28 +0800 Subject: [PATCH] * Add parent title when batch create children task. --- module/task/control.php | 6 ++++-- module/task/view/batchcreate.html.php | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/module/task/control.php b/module/task/control.php index fa396b2738..589cee7619 100644 --- a/module/task/control.php +++ b/module/task/control.php @@ -225,21 +225,23 @@ class task extends control $position[] = $this->lang->task->common; $position[] = $this->lang->task->batchCreate; + if($isChildren) $this->view->parentTitle = $this->dao->select('name')->from(TABLE_TASK)->where('id')->eq($taskID)->fetch('name'); + $this->view->title = $title; $this->view->position = $position; $this->view->project = $project; $this->view->stories = $stories; $this->view->modules = $modules; $this->view->parent = $taskID; - $this->view->storyID = $storyID; $this->view->isChildren = $isChildren; + $this->view->storyID = $storyID; $this->view->story = $this->story->getByID($storyID); $this->view->storyTasks = $this->task->getStoryTaskCounts(array_keys($stories), $projectID); $this->view->members = $members; $this->view->moduleID = $moduleID; $this->display(); } - + /** * Common actions of task module. * diff --git a/module/task/view/batchcreate.html.php b/module/task/view/batchcreate.html.php index 5aca5baa16..525059619a 100644 --- a/module/task/view/batchcreate.html.php +++ b/module/task/view/batchcreate.html.php @@ -15,7 +15,7 @@
icons['task']);?> - icons['batchCreate']);?> task->batchCreateChildren : $lang->task->batchCreate;?> + icons['batchCreate']);?> task->batchCreateChildren : $lang->task->batchCreate;?> type != 'ops'):?>story->zeroTask;?>
pasteText, "data-toggle='myModal'", 'btn btn-primary')?>