This commit is contained in:
zhouxudong
2022-01-14 08:46:14 +08:00
parent 6eed68f446
commit a73e08d4cb
+3 -3
View File
@@ -1034,13 +1034,13 @@ 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 . '"';
}
if($action->objectType == 'user')
{
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;
}