From e7ac26998e208d7d8cf50bc02e4e85dee0e0fdb8 Mon Sep 17 00:00:00 2001 From: zenggang Date: Thu, 22 Jul 2021 16:48:02 +0800 Subject: [PATCH] * Finish task #40470 --- module/action/model.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/module/action/model.php b/module/action/model.php index 670ba4be6e..706b7bb365 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -928,6 +928,7 @@ class actionModel extends model public function transformActions($actions) { $this->app->loadLang('todo'); + $this->app->loadLang('stakeholder'); $requirements = array(); /* Get commiters. */ @@ -989,6 +990,13 @@ class actionModel extends model if($object->type == 'project') $objectProject[$object->id] = $object->id; } } + elseif($objectType == 'stakeholder'){ + $objectName = $this->dao->select("t1.id, t2.realname")->from($table)->alias('t1') + ->leftJoin(TABLE_USER)->alias('t2')->on("t1.{$field} = t2.account") + ->where('t1.id')->in($objectIds) + ->fetchPairs(); + $objectProject = array(); + } else { $objectName = $this->dao->select("id, $field AS name")->from($table)->where('id')->in($objectIds)->fetchPairs(); @@ -1029,7 +1037,7 @@ class actionModel extends model $objectType = strtolower($action->objectType); $action->originalDate = $action->date; $action->date = date(DT_MONTHTIME2, strtotime($action->date)); - $action->actionLabel = isset($this->lang->action->label->$actionType) ? $this->lang->action->label->$actionType : $action->action; + $action->actionLabel = isset($this->lang->action->label->$actionType) ? $this->lang->action->label->$actionType : (isset($this->lang->$objectType->$actionType) ? $this->lang->$objectType->$actionType : $action->action); $action->objectLabel = $objectType; if(isset($this->lang->action->label->$objectType)) {