From a951e67f59ff2de695b763e220358f123f6a2acf Mon Sep 17 00:00:00 2001
From: lichengjun <lichengjun@easycorp.ltd>
Date: Fri, 2 Jul 2021 11:04:50 +0800
Subject: [PATCH] * Fix issues bugs.

---
 module/gitlab/config.php | 3 ++-
 module/gitlab/model.php  | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/module/gitlab/config.php b/module/gitlab/config.php
index 5f699712cf..1528859692 100644
--- a/module/gitlab/config.php
+++ b/module/gitlab/config.php
@@ -16,7 +16,8 @@ $config->gitlab->actions['issue'] = array();
 $config->gitlab->zentaoObjectLabel = new stdclass;
 $config->gitlab->zentaoObjectLabel->name         = "zentao_%s/%s";
 $config->gitlab->zentaoObjectLabel->description  = "%s";
-$config->gitlab->zentaoObjectLabel->color        =  new stdclass;
+
+$config->gitlab->zentaoObjectLabel->color = new stdclass;
 $config->gitlab->zentaoObjectLabel->color->task  = '#0033CC';
 $config->gitlab->zentaoObjectLabel->color->story = '#69D100';
 $config->gitlab->zentaoObjectLabel->color->bug   = '#D10069';
diff --git a/module/gitlab/model.php b/module/gitlab/model.php
index 26b568df36..3e051e58ad 100644
--- a/module/gitlab/model.php
+++ b/module/gitlab/model.php
@@ -748,7 +748,7 @@ class gitlabModel extends model
     {
         $label = new stdclass;
         $label->name        = sprintf($this->config->gitlab->zentaoObjectLabel->name, $objectType, $objectID);
-        $label->color       = $this->config->gitlab->zentaoObjectLabel->colors->$objectType;
+        $label->color       = $this->config->gitlab->zentaoObjectLabel->color->$objectType;
         $label->description = common::getSysURL() . helper::createLink($objectType, 'view', "id={$objectID}");
 
         return $this->apiCreateLabel($gitlabID, $projectID, $label);
@@ -834,7 +834,7 @@ class gitlabModel extends model
         if($syncedIssue) return $this->apiUpdateIssue($gitlabID, $projectID, $syncedIssue->issueID, $issue);
         
         $label = $this->createZentaoObjectLabel($gitlabID, $projectID, $objectType, $objectID);
-        $issue->labels = $label->name;
+        $issue->labels = isset($label->name) ? $label->name : '';
 
         $issue = $this->apiCreateIssue($gitlabID, $projectID, $issue);
         if($issue) $this->saveSyncedIssue($objectType, $object, $gitlabID, $issue);
@@ -914,7 +914,7 @@ class gitlabModel extends model
             if($value) $issue->$field = $value;
         }
 
-        if($issue->assignee_id == 'closed') unset($issue->assignee_id);
+        if($isset($issue->assignee_id) and $issue->assignee_id == 'closed') unset($issue->assignee_id);
 
         /* 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';
@@ -1053,7 +1053,7 @@ class gitlabModel extends model
             if($value) $issue->$field = $value;
         }
 
-        if($issue->assignee_id == 'closed') unset($issue->assignee_id);
+        if(isset($issue->assignee_id) and $issue->assignee_id == 'closed') unset($issue->assignee_id);
 
         /* 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';