Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Differentiate batch creation tasks and subtasks.

Browse Source
This commit is contained in:
wumo
2018-03-26 09:00:31 +08:00
parent a8e8c79660
commit 07fa914150
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/control.php
+2 -3
View File
@@ -193,7 +193,7 @@ class task extends control
* @access public
* @return void
*/
public function batchCreate($projectID = 0, $storyID = 0, $moduleID = 0, $taskID = 0, $iframe = 0, $isChildren = false)
public function batchCreate($projectID = 0, $storyID = 0, $moduleID = 0, $taskID = 0, $iframe = 0)
{
$project = $this->project->getById($projectID);
$taskLink = $this->createLink('project', 'browse', "projectID=$projectID&tab=task");
@@ -225,7 +225,7 @@ 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');
if($taskID) $this->view->parentTitle = $this->dao->select('name')->from(TABLE_TASK)->where('id')->eq($taskID)->fetch('name');
$this->view->title = $title;
$this->view->position = $position;
@@ -233,7 +233,6 @@ class task extends control
$this->view->stories = $stories;
$this->view->modules = $modules;
$this->view->parent = $taskID;
$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);
module/task/model.php
+1 -1
View File
@@ -2288,7 +2288,7 @@ class taskModel extends model
common::printIcon('task', 'edit', "taskID=$task->id", $task, 'list');
if(empty($task->team) or empty($task->children))
{
common::printIcon('task', 'batchCreate', "project=$task->project&storyID=$task->story&moduleID=$task->module&taskID=$task->id&ifame=0&isChildren=1", $task, 'list', 'plus', '', '', '', '', $this->lang->task->children);
common::printIcon('task', 'batchCreate', "project=$task->project&storyID=$task->story&moduleID=$task->module&taskID=$task->id&ifame=0", $task, 'list', 'plus', '', '', '', '', $this->lang->task->children);
}
break;
}
module/task/view/batchcreate.html.php
+1 -1
View File
@@ -17,7 +17,7 @@
<span class='prefix'><?php echo html::icon($lang->icons['task']);?></span>
<strong>
<small class='text-muted'><?php echo html::icon($lang->icons['batchCreate']);?></small>
<?php if($isChildren):?>
<?php if($parent):?>
<span class='pull-left'><?php echo $parentTitle;?></span>
<?php echo $lang->task->batchCreateChildren;?>
<?php else:?>