From 9a5d8d50b97e4f7bb4b46216dfc0f212ac2088ee Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Mon, 26 Apr 2021 09:07:28 +0800 Subject: [PATCH] * Fix bug #12347. --- module/action/model.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/module/action/model.php b/module/action/model.php index e002345d95..aec6eb0dec 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -868,6 +868,7 @@ class actionModel extends model public function transformActions($actions) { $this->app->loadLang('todo'); + $requirements = array(); /* Get commiters. */ $commiters = $this->loadModel('user')->getCommiters(); @@ -901,6 +902,16 @@ class actionModel extends model $objectProject[$object->id] = $object->project > 0 ? $object->project : $object->id; } } + elseif($objectType == 'story') + { + $objectInfo = $this->dao->select('id,title,type')->from($table)->where('id')->in($objectIds)->fetchAll(); + foreach($objectInfo as $object) + { + $objectName[$object->id] = $object->title; + if($object->type == 'requirement') $requirements[$object->id] = $object->id; + } + $objectProject = array(); + } else { $objectName = $this->dao->select("id, $field AS name")->from($table)->where('id')->in($objectIds)->fetchPairs(); @@ -946,6 +957,10 @@ class actionModel extends model if(isset($this->lang->action->label->$objectType)) { $objectLabel = $this->lang->action->label->$objectType; + + /* Replace story to requirement. */ + if(in_array($action->objectID, $requirements)) $objectLabel = str_replace($this->lang->SRCommon, $this->lang->URCommon, $objectLabel); + if(!is_array($objectLabel)) $action->objectLabel = $objectLabel; if(is_array($objectLabel) and isset($objectLabel[$actionType])) $action->objectLabel = $objectLabel[$actionType]; }