Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'sprint/31_zhouxin_17711' into 'master'

Browse Source 
Sprint/31 zhouxin 17711

See merge request easycorp/zentaopms!1066
This commit is contained in:
孙广明
2021-12-22 07:49:40 +00:00
parent 83c8385b69 d0eb0e8662
commit ded871aa6f
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/config.php
+1
View File
@@ -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';
module/action/model.php
+8
View File
@@ -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();