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

* Code for project-task url.

Browse Source
This commit is contained in:
孙广明
2022-07-12 15:47:29 +08:00
parent c56ec2cbe4
commit 8dc58ed292
7 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/control.php
+7 -2
View File
@@ -48,6 +48,7 @@ class task extends control
$executions = $this->execution->getPairs(0, 'all', !common::canModify('execution', $execution) ? 'noclosed' : '');
$executionID = $this->execution->saveState($executionID, $executions);
$this->execution->setMenu($executionID);
if($this->app->tab == 'project') $this->loadModel('project')->setMenu($this->session->project);
$this->execution->getLimitedExecution();
$limitedExecutions = !empty($_SESSION['limitedExecutions']) ? $_SESSION['limitedExecutions'] : '';
@@ -332,6 +333,7 @@ class task extends control
/* Set menu. */
$this->execution->setMenu($execution->id);
if($this->app->tab == 'project') $this->loadModel('project')->setMenu($this->session->project);
/* When common task are child tasks, query whether common task are consumed. */
$taskConsumed = 0;
@@ -540,6 +542,8 @@ class task extends control
}
}
if($this->app->tab == 'project') $this->loadModel('project')->setMenu($this->session->project);
$tasks = $this->task->getParentTaskPairs($this->view->execution->id, $this->view->task->parent);
if(isset($tasks[$taskID])) unset($tasks[$taskID]);
@@ -855,6 +859,7 @@ class task extends control
$this->session->set('executionList', $this->app->getURI(true), 'execution');
$this->commonAction($taskID);
if($this->app->tab == 'project') $this->loadModel('project')->setMenu($this->session->project);
$taskID = (int)$taskID;
$task = $this->task->getById($taskID, true);
@@ -1803,7 +1808,7 @@ class task extends control
$showmore = ($count == 50 and $task == end($tasks)) ? 'showmore' : '';
$body .= "<tr data-parent=$executionID data-id=$task->id data-nest-path='$path' data-nest-parent=$executionID class='is-nest-child $showmore'>";
$body .= '<td>' . html::a($this->createLink('task', 'view', "id=$task->id"), $task->name) . '</td>';
$body .= '<td>' . html::a($this->createLink('task', 'view', "id=$task->id"), $task->name, '', "data-app='project'") . '</td>';
$body .= '<td>' . zget($users, $task->assignedTo, '') . '</td>';
$body .= '<td>' . zget($this->lang->task->statusList, $task->status, '') . '</td>';
$body .= '<td></td>';
@@ -1824,7 +1829,7 @@ class task extends control
$path = $execution->grade == 2 ? "$execution->parent,$execution->id,$childTask->parent,$childTask->id," : ",$execution->id,$childTask->parent,$childTask->id,";
$body .= "<tr data-parent=$executionID data-id=$childTask->id data-nest-path='$path' data-nest-parent=$executionID class='is-nest-child no-nest'>";
$body .= '<td>' . html::a($this->createLink('task', 'view', "id=$childTask->id"), $childTask->name) . '</td>';
$body .= '<td>' . html::a($this->createLink('task', 'view', "id=$childTask->id"), $childTask->name, '', "data-app='project'") . '</td>';
$body .= '<td>' . zget($users, $childTask->assignedTo, '') . '</td>';
$body .= '<td>' . zget($this->lang->task->statusList, $childTask->status, '') . '</td>';
$body .= '<td></td>';