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

Merge branch dev/bug-62882 of zentao/zentaopms (#8979)

Browse Source
This commit is contained in:
刘刚
2025-05-28 16:37:44 +08:00
committed by Gitfox
parent ffe1d319fb 8fa13ff493
commit e13886f9b5
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/model.php
+3 -3
View File
@@ -2169,7 +2169,7 @@ class actionModel extends model
}
elseif(strpos(",{$this->config->action->needGetProjectType},", ",{$objectType},") !== false || $objectType == 'project' || $objectType == 'execution')
{
$objectInfo = $this->dao->select("id, project, {$field} AS name")->from($table)->where('id')->in($objectIdList)->orderBy('id_asc')->fetchAll();
$objectInfo = $this->dao->select("id, project, {$field} AS name")->from($table)->where('id')->in($objectIdList)->setAutoTpl(false)->orderBy('id_asc')->fetchAll();
foreach($objectInfo as $object)
{
$objectName[$object->id] = $objectType == 'gapanalysis' ? zget($users, $object->name) : $object->name; // Get user realname if objectType is gapanalysis.
@@ -2180,7 +2180,7 @@ class actionModel extends model
{
if($objectType == 'team') $table = TABLE_PROJECT;
$objectField = $objectType == 'story' ? 'id,title,type' : 'id,team AS title,type';
$objectInfo = $this->dao->select($objectField)->from($table)->where('id')->in($objectIdList)->orderBy('id_asc')->fetchAll();
$objectInfo = $this->dao->select($objectField)->from($table)->where('id')->in($objectIdList)->setAutoTpl(false)->orderBy('id_asc')->fetchAll();
foreach($objectInfo as $object)
{
$objectName[$object->id] = $object->title;
@@ -2200,7 +2200,7 @@ class actionModel extends model
}
else
{
$objectName = $this->dao->select("id, {$field} AS name")->from($table)->where('id')->in($objectIdList)->orderBy('id_asc')->fetchPairs();
$objectName = $this->dao->select("id, {$field} AS name")->from($table)->where('id')->in($objectIdList)->setAutoTpl(false)->orderBy('id_asc')->fetchPairs();
}
return array($objectName, $relatedProject, $requirements, $epics);
}