From 86702f6c7cc36ce8bb8174bd3b3f01b817da3b24 Mon Sep 17 00:00:00 2001 From: dingguodong Date: Wed, 4 Aug 2021 13:54:29 +0800 Subject: [PATCH] * Fix bug for description is empty when importing a issue. --- module/gitlab/model.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/module/gitlab/model.php b/module/gitlab/model.php index 17547e4fac..e80bbf41e2 100644 --- a/module/gitlab/model.php +++ b/module/gitlab/model.php @@ -1367,15 +1367,16 @@ class gitlabModel extends model $value = ''; list($gitlabField, $optionType, $options) = explode('|', $config); if(!isset($changes->$gitlabField) and $object->id != 0) continue; - if($optionType == 'field') $value = $issue->$gitlabField; - if($optionType == 'fields') $value = $issue->$gitlabField; // TODO(dingguodong) not implemented. + if($optionType == 'field' or $optionType == 'fields') $value = $issue->$gitlabField; if($options == 'date') $value = $value ? date('Y-m-d', strtotime($value)) : '0000-00-00'; if($options == 'datetime') $value = $value ? date('Y-m-d H:i:s', strtotime($value)) : '0000-00-00 00:00:00'; if($optionType == 'userPairs' and isset($issue->$gitlabField)) $value = zget($gitlabUsers, $issue->$gitlabField); if($optionType == 'configItems' and isset($issue->$gitlabField)) $value = array_search($issue->$gitlabField, $this->config->gitlab->$options); - if($value) $object->$zentaoField = $value; - if($gitlabField == "description") $object->$zentaoField .= "
" . $issue->web_url; + /* Execute this line even `$value == ""`, such as `$issue->description == ""`. */ + if($value or $value == "") $object->$zentaoField = $value; + + if($gitlabField == "description") $object->$zentaoField .= "

web_url}\" target=\"_blank\">{$issue->web_url}"; } return $object; }