From 5c25aba4c664ecf74266de1f190942791352289e Mon Sep 17 00:00:00 2001
From: lichengjun <lichengjun@easycorp.ltd>
Date: Thu, 8 Jul 2021 14:46:27 +0800
Subject: [PATCH] * Fix task code bug.

---
 module/task/control.php | 4 +---
 module/task/model.php   | 3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/module/task/control.php b/module/task/control.php
index 5ec982cb8d..64da0f0f6a 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -647,9 +647,7 @@ class task extends control
             {
                 if(isset($muletipleTasks[$taskID]) and $task->assignedTo != $this->app->user->account) continue;
                 if(isset($muletipleTasks[$taskID]) and !isset($muletipleTasks[$taskID][$this->post->assignedTo])) continue;
-
-                $relation = $this->loadModel('gitlab')->getRelationByObject('task', $taskID);
-                if(!empty($task))$this->loadModel('gitlab')->apiUpdateIssue($relation->gitlabID, $relation->projectID, $relation->issueID, 'task', $task);
+                
                 $changes = $this->task->assign($taskID);
                 if(dao::isError()) die(js::error(dao::getError()));
                 $actionID = $this->action->create('task', $taskID, 'Assigned', $this->post->comment, $this->post->assignedTo);
diff --git a/module/task/model.php b/module/task/model.php
index b83c8b74f7..a17ae4b1a9 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -1389,8 +1389,7 @@ class taskModel extends model
             ->where('id')->eq($taskID)->exec();
         
         $relation = $this->loadModel('gitlab')->getRelationByObject('task', $taskID);
-        $task->assignee_id = $this->loadModel('gitlab')->getGitlabUserID($relation->gitlabID, $task->assignedTo);
-        if($task->assignee_id != '') $this->loadModel('gitlab')->apiUpdateIssue($relation->gitlabID, $relation->projectID, $relation->issueID, $task);
+        if(!empty($relation)) $this->loadModel('gitlab')->apiUpdateIssue($relation->gitlabID, $relation->projectID, $relation->issueID, 'task', $oldTask);
 
         if(!dao::isError()) return common::createChanges($oldTask, $task);
     }