From d0f2bae549df34a7fcf6355488c2e76a5d972170 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Wed, 4 Dec 2024 15:46:40 +0800 Subject: [PATCH] * [task#133225,doing,0.5h] optimize. --- module/task/ui/edit.html.php | 1 + module/task/zen.php | 13 ++++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/module/task/ui/edit.html.php b/module/task/ui/edit.html.php index 00bb79bd1c..c29dce4d3f 100644 --- a/module/task/ui/edit.html.php +++ b/module/task/ui/edit.html.php @@ -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)); diff --git a/module/task/zen.php b/module/task/zen.php index 41ad6a6bfe..898957eb84 100644 --- a/module/task/zen.php +++ b/module/task/zen.php @@ -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; } /**