From 6eed68f446d079db84949fd4bf798266baed62bb Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Thu, 13 Jan 2022 15:17:54 +0800
Subject: [PATCH 1/3] *Fix bug #13636.

---
 module/action/model.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/module/action/model.php b/module/action/model.php
index 20778d1b2f..4b2a48b6a9 100755
--- a/module/action/model.php
+++ b/module/action/model.php
@@ -1039,6 +1039,11 @@ class actionModel extends model
                 if($action->objectID == 0) $action->objectName = $this->lang->branch->main;
                 $action->objectName = '"' . $action->extra . ' "' . $this->lang->action->to . ' "' . $action->objectName . '"';
             }
+            if($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;
 

From a73e08d4cbb04f799a8f6f520b3ce5d4a3fe73a7 Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Fri, 14 Jan 2022 08:46:14 +0800
Subject: [PATCH 2/3] *Fix bug #13636.

---
 module/action/model.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/action/model.php b/module/action/model.php
index 4b2a48b6a9..b14624c43b 100755
--- a/module/action/model.php
+++ b/module/action/model.php
@@ -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;
             }

From ac318de17560f26a0cac210dc070fe38f3ac25df Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Mon, 17 Jan 2022 13:12:02 +0800
Subject: [PATCH 3/3] *Fix bug #13636.

---
 module/action/model.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/module/action/model.php b/module/action/model.php
index b14624c43b..401fb11bb1 100755
--- a/module/action/model.php
+++ b/module/action/model.php
@@ -1033,14 +1033,13 @@ class actionModel extends model
             {
                 $action->objectName .= $this->lang->action->label->startProgram;
             }
-
             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;
             }