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

* [task#133225,doing,0.5h] optimize.

Browse Source
This commit is contained in:
tianshujie
2024-12-30 09:51:11 +08:00
committed by 刘刚
parent e560a94846
commit d0f2bae549
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/ui/edit.html.php
+1
View File
@@ -19,6 +19,7 @@ jsVar('oldStoryID', $task->story);
jsVar('oldAssignedTo', $task->assignedTo);
jsVar('oldExecutionID', $task->execution);
jsVar('oldConsumed', $task->consumed);
jsVar('objectID', $execution->multiple ? $execution->id : $execution->project);
jsVar('taskStatus', $task->status);
jsVar('currentUser', $app->user->account);
jsVar('team', array_values($task->members));
module/task/zen.php
+8 -5
View File
@@ -326,9 +326,8 @@ class taskZen extends task
}
}
$execution = $this->execution->fetchByID($task->execution);
if($execution->multiple) $manageLink = common::hasPriv('execution', 'manageMembers') ? $this->createLink('execution', 'manageMembers', "execution={$execution->id}") : '';
if(!$execution->multiple) $manageLink = common::hasPriv('project', 'manageMembers') ? $this->createLink('project', 'manageMembers', "projectID={$execution->project}") : '';
if($this->view->execution->multiple) $manageLink = common::hasPriv('execution', 'manageMembers') ? $this->createLink('execution', 'manageMembers', "execution={$this->view->execution->id}") : '';
if(!$this->view->execution->multiple) $manageLink = common::hasPriv('project', 'manageMembers') ? $this->createLink('project', 'manageMembers', "projectID={$this->view->execution->project}") : '';
$this->view->title = $this->lang->task->edit . 'TASK' . $this->lang->hyphen . $this->view->task->name;
$this->view->stories = $this->story->addGradeLabel($stories);
@@ -371,8 +370,12 @@ class taskZen extends task
if(!isset($members[$task->assignedTo])) $members[$task->assignedTo] = $task->assignedTo;
if(isset($members['closed']) || $task->status == 'closed') $members['closed'] = 'Closed';
$this->view->members = $members;
$this->view->users = $this->loadModel('user')->getPairs();
if($this->view->execution->multiple) $manageLink = common::hasPriv('execution', 'manageMembers') ? $this->createLink('execution', 'manageMembers', "execution={$this->view->execution->id}") : '';
if(!$this->view->execution->multiple) $manageLink = common::hasPriv('project', 'manageMembers') ? $this->createLink('project', 'manageMembers', "projectID={$this->view->execution->project}") : '';
$this->view->members = $members;
$this->view->users = $this->loadModel('user')->getPairs();
$this->view->manageLink = $manageLink;
}
/**