From e8695963aff6e4319237b0d7dc10221245cd83e8 Mon Sep 17 00:00:00 2001 From: lichengjun Date: Tue, 29 Jun 2021 15:58:38 +0800 Subject: [PATCH] *Task fixed close issues. --- module/gitlab/model.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/module/gitlab/model.php b/module/gitlab/model.php index d0891c6366..3fb2c418db 100644 --- a/module/gitlab/model.php +++ b/module/gitlab/model.php @@ -800,6 +800,7 @@ class gitlabModel extends model $map = $this->config->gitlab->maps->task; $issue = new stdclass; $gitlabUsers = $this->getUserAccountIdPairs($gitlabID); + foreach($map as $taskField => $config) { $value = ''; @@ -812,6 +813,11 @@ class gitlabModel extends model } if($value) $issue->$field = $value; } + + /* issue->state is null when creating it, we should put status_event when updating it. */ + if(isset($issue->state) and $issue->state == 'closed') $issue->state_event='close'; + if(isset($issue->state) and $issue->state == 'opened') $issue->state_event='reopen'; + return $issue; } @@ -848,6 +854,10 @@ class gitlabModel extends model if($value) $issue->$field = $value; } + /* issue->state is null when creating it, we should put status_event when updating it. */ + if(isset($issue->state) and $issue->state == 'closed') $issue->state_event='close'; + if(isset($issue->state) and $issue->state == 'opened') $issue->state_event='reopen'; + return $issue; }