From 758f1b7d69c102be06ea8b6cc2d79fa1f32074d8 Mon Sep 17 00:00:00 2001 From: dingguodong Date: Fri, 25 Jun 2021 16:43:56 +0800 Subject: [PATCH] * Bind label when create issue for sync task and story. --- module/gitlab/model.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/module/gitlab/model.php b/module/gitlab/model.php index cb1f05b8c9..9026a14c15 100644 --- a/module/gitlab/model.php +++ b/module/gitlab/model.php @@ -547,11 +547,14 @@ class gitlabModel extends model $syncedIssue = $this->getSyncedIssue($objectType = 'task', $objectID = $taskID, $gitlab); $issue = $this->taskToIssue($gitlab, $gitlabProject, $task); + + $this->createZentaoObjectLabel($gitlab, $gitlabProject, 'task', $taskID); + $issue->labels = sprintf($this->config->gitlab->zentaoObjectLabel->name, 'task', $taskID); + if($syncedIssue) $issue = $this->apiUpdateIssue($gitlab, $gitlabProject, $syncedIssue, $issue); $issue = $this->apiCreateIssue($gitlab, $gitlabProject, $issue); $this->saveSyncedIssue('task', $task, $gitlab, $issue); - $this->createZentaoObjectLabel($gitlab, $gitlabProject, 'task', $taskID); } /** @@ -568,10 +571,13 @@ class gitlabModel extends model $story = $this->loadModel('story')->getByID($storyID); $syncedIssue = $this->getSyncedIssue($objectType = 'story', $objectID = $storyID, $gitlab); $issue = $this->storyToIssue($gitlab, $gitlabProject, $story); + + $this->createZentaoObjectLabel($gitlab, $gitlabProject, 'story', $storyID); + $issue->labels = sprintf($this->config->gitlab->zentaoObjectLabel->name, 'story', $storyID); + if($syncedIssue) $issue = $this->apiUpdateIssue($gitlab, $gitlabProject, $syncedIssue, $issue); $issue = $this->apiCreateIssue($gitlab, $gitlabProject, $issue); if($issue) $this->saveSyncedIssue('story', $story, $gitlab, $issue); - $this->createZentaoObjectLabel($gitlab, $gitlabProject, 'story', $storyID); } /**