From 7769b30e2f79749788e0e5d735db52ffdae5ec32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E8=BE=B0=E8=BD=A9?= <songchenxuan@easycorp.ltd>
Date: Tue, 18 Jun 2024 16:08:35 +0800
Subject: [PATCH] * [bug#50902,done,1h] fix bug.

---
 module/task/control.php | 8 +++++---
 module/task/zen.php     | 5 +----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/module/task/control.php b/module/task/control.php
index 86fa61aed1..f2d7a8243c 100755
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -271,7 +271,10 @@ class task extends control
             return $this->send($response);
         }
 
-        $this->taskZen->buildAssignToForm($executionID, $taskID);
+        $this->view->task  = $task;
+        $this->view->title = $this->view->execution->name . $this->lang->hyphen . $this->lang->task->assign;
+        $this->taskZen->buildUsersAndMembersToFrom($executionID, $taskID);
+        $this->display();
     }
 
     /**
@@ -467,11 +470,10 @@ class task extends control
         $assignedTo = empty($task->assignedTo) ? $this->app->user->account : $task->assignedTo;
 
         $this->view->title           = $this->view->execution->name . $this->lang->hyphen .$this->lang->task->start;
-        $this->view->users           = $this->loadModel('user')->getPairs('noletter');
-        $this->view->members         = $this->user->getTeamMemberPairs($task->execution, 'execution', 'nodeleted');
         $this->view->assignedTo      = !empty($task->team) ? $this->task->getAssignedTo4Multi($task->team, $task) : $assignedTo;
         $this->view->canRecordEffort = $this->task->canOperateEffort($task);
         $this->view->currentTeam     = $currentTeam;
+        $this->taskZen->buildUsersAndMembersToFrom($task->execution, $taskID);
         $this->display();
     }
 
diff --git a/module/task/zen.php b/module/task/zen.php
index 6aac3aae34..1057e4cc57 100644
--- a/module/task/zen.php
+++ b/module/task/zen.php
@@ -300,7 +300,7 @@ class taskZen extends task
      * @access protected
      * @return void
      */
-    protected function buildAssignToForm(int $executionID, int $taskID): void
+    protected function buildUsersAndMembersToFrom(int $executionID, int $taskID)
     {
         $task         = $this->task->getByID($taskID);
         $projectModel = $this->dao->findById($task->project)->from(TABLE_PROJECT)->fetch('model');
@@ -318,11 +318,8 @@ 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->title   = $this->view->execution->name . $this->lang->hyphen . $this->lang->task->assign;
-        $this->view->task    = $task;
         $this->view->members = $members;
         $this->view->users   = $this->loadModel('user')->getPairs();
-        $this->display();
     }
 
     /**