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

Merge branch 'sprint/zhouxudong_fixbug_13636' into 'master'

Browse Source 
*Fix bug #13636.

See merge request easycorp/zentaopms!1384
This commit is contained in:
朱金勇
2022-01-18 05:06:01 +00:00
parent 34a41b82d1 ac318de175
commit 5e285ba992
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/model.php
+6 -2
View File
@@ -1038,12 +1038,16 @@ class actionModel extends model
{
$action->objectName .= $this->lang->action->label->startProgram;
}
if($action->objectType == 'branch' and $action->action == 'mergedbranch')
elseif($action->objectType == 'branch' and $action->action == 'mergedbranch')
{
if($action->objectID == 0) $action->objectName = $this->lang->branch->main;
$action->objectName = '"' . $action->extra . ' "' . $this->lang->action->to . ' "' . $action->objectName . '"';
}
elseif($action->objectType == 'user')
{
$user = $this->dao->select('id,realname')->from(TABLE_USER)->where('id')->eq($action->objectID)->fetch();
if($user) $action->objectName = $user->realname;
}
$projectID = isset($relatedProjects[$action->objectType][$action->objectID]) ? $relatedProjects[$action->objectType][$action->objectID] : 0;