From 96e55fa0047cd84d9a1b13f60fe11bc6274bfddc Mon Sep 17 00:00:00 2001
From: Roly Gutierrez <roly.gutierrez@processmaker.com>
Date: Tue, 7 Dec 2021 17:25:04 -0400
Subject: [PATCH] PMCORE-3567 User is not displayed in the change log for
 Before and After routing

---
 workflow/engine/classes/Cases.php                |  5 +++--
 workflow/engine/templates/cases/caseChangeLog.js | 10 ++++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/workflow/engine/classes/Cases.php b/workflow/engine/classes/Cases.php
index a689e2d32..b5d773a1f 100644
--- a/workflow/engine/classes/Cases.php
+++ b/workflow/engine/classes/Cases.php
@@ -3401,10 +3401,11 @@ class Cases
         $lastFields = $this->executeTriggerFromList($triggersList, $fieldsCase, $stepType, $stepUidObj, $triggerType);
 
         /*----------------------------------********---------------------------------*/
-        $usrUid = empty($fieldsCase['USER_LOGGED']) ? '' : $fieldsCase['USER_LOGGED'];
+        $usrUid = empty($_SESSION['USER_LOGGED']) ? '' : $_SESSION['USER_LOGGED'];
         ChangeLog::getChangeLog()
             ->setObjectUid($stepUidObj)
-            ->getUsrIdByUsrUid($usrUid)
+            ->getUsrIdByUsrUid($usrUid, true)
+            ->getTasIdByTasUid($tasUid, true)
             ->getExecutedAtIdByTriggerType($triggerType);
         /*----------------------------------********---------------------------------*/
 
diff --git a/workflow/engine/templates/cases/caseChangeLog.js b/workflow/engine/templates/cases/caseChangeLog.js
index f9db839da..5e0980a76 100644
--- a/workflow/engine/templates/cases/caseChangeLog.js
+++ b/workflow/engine/templates/cases/caseChangeLog.js
@@ -6,7 +6,7 @@ Ext.onReady(function () {
         layout: 'border',
         items: [
             new Ext.grid.GridPanel({
-                region: 'center',
+                "region": 'center',
                 "width": "100%",
                 "height": 300,
                 "stateful": true,
@@ -56,13 +56,18 @@ Ext.onReady(function () {
                             header: _('ID_FIELD_NAME'),
                             width: 120,
                             sortable: false,
-                            dataIndex: 'field'
+                            dataIndex: 'field',
+                            menuDisabled: true,
+                            renderer: function (value, metaData, record, rowIndex, colIndex, store) {
+                                return "<b>"+value+"</b>";
+                            }
                         },
                         {
                             header: _('ID_PREV_VALUES'),
                             flex: 1,
                             sortable: false,
                             dataIndex: 'previousValue',
+                            menuDisabled: true,
                             renderer: function (value, p, record) {
                                 return value;
                             }
@@ -72,6 +77,7 @@ Ext.onReady(function () {
                             flex: 1,
                             sortable: false,
                             dataIndex: 'currentValue',
+                            menuDisabled: true,
                             renderer: function (value, p, record) {
                                 return value;
                             }