From 32bb53370c971412a34ebb8163b5400e01b35f2a Mon Sep 17 00:00:00 2001 From: zhouxin Date: Wed, 22 Dec 2021 06:01:35 +0000 Subject: [PATCH] Fix bug #17711. --- module/action/config.php | 1 + module/action/lang/en.php | 1 + module/action/lang/zh-cn.php | 1 + module/action/model.php | 8 ++++++++ 4 files changed, 11 insertions(+) diff --git a/module/action/config.php b/module/action/config.php index 7d0bf5b9d6..d2c61d98d4 100755 --- a/module/action/config.php +++ b/module/action/config.php @@ -33,6 +33,7 @@ $config->action->objectNameFields['job'] = 'name'; $config->action->objectNameFields['team'] = 'name'; $config->action->objectNameFields['pipeline'] = 'name'; $config->action->objectNameFields['mr'] = 'title'; +$config->action->objectNameFields['reviewcl'] = 'title'; $config->action->objectNameFields['kanbancolumn'] = 'name'; $config->action->objectNameFields['kanbanlane'] = 'name'; $config->action->objectNameFields['kanbanspace'] = 'name'; diff --git a/module/action/lang/en.php b/module/action/lang/en.php index 5177d3e8c4..abb13620f2 100755 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -125,6 +125,7 @@ $lang->action->objectTypes['gitlabuser'] = 'GitLab User'; $lang->action->objectTypes['gitlabgroup'] = 'GitLab Group'; $lang->action->objectTypes['gitlabbranch'] = 'GitLab Branch'; $lang->action->objectTypes['gitlabbranchpriv'] = 'GitLab Protected Branches'; +$lang->action->objectTypes['reviewcl'] = 'Review'; $lang->action->objectTypes['kanbanspace'] = 'Kanban Space'; $lang->action->objectTypes['kanban'] = 'Kanban'; $lang->action->objectTypes['kanbanregion'] = 'Kanban Region'; diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php index 206eb1c5e6..67a64aa494 100755 --- a/module/action/lang/zh-cn.php +++ b/module/action/lang/zh-cn.php @@ -125,6 +125,7 @@ $lang->action->objectTypes['gitlabuser'] = 'GitLab用户'; $lang->action->objectTypes['gitlabgroup'] = 'GitLab群组'; $lang->action->objectTypes['gitlabbranch'] = 'GitLab分支'; $lang->action->objectTypes['gitlabbranchpriv'] = 'GitLab保护分支'; +$lang->action->objectTypes['reviewcl'] = '检查项'; $lang->action->objectTypes['kanbanspace'] = '看板空间'; $lang->action->objectTypes['kanban'] = '看板'; $lang->action->objectTypes['kanbanregion'] = '看板区域'; diff --git a/module/action/model.php b/module/action/model.php index 135450f6c2..ddfeef63fe 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -1109,6 +1109,14 @@ class actionModel extends model if($object->type == 'requirement') $requirements[$object->id] = $object->id; } } + elseif($objectType == 'reviewcl') + { + $objectInfo = $this->dao->select('id,title')->from($table)->where('id')->in($objectIdList)->fetchAll(); + foreach($objectInfo as $object) + { + $objectName[$object->id] = $object->title; + } + } elseif($objectType == 'team') { $objectInfo = $this->dao->select('id,team,type')->from(TABLE_PROJECT)->where('id')->in($objectIdList)->fetchAll();