From 5a96935aa7abe09545907c97a700d1eac05f0b52 Mon Sep 17 00:00:00 2001 From: "Paula V. Quispe" Date: Thu, 21 Apr 2016 14:51:00 -0400 Subject: [PATCH] HOR-826 HOR-826 --- .../ProcessMaker/BusinessModel/Cases/ChangeLog.php | 12 ++++++++++-- workflow/engine/templates/cases/caseChangeLog.js | 8 ++------ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Cases/ChangeLog.php b/workflow/engine/src/ProcessMaker/BusinessModel/Cases/ChangeLog.php index a435e3789..0d026dd12 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Cases/ChangeLog.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases/ChangeLog.php @@ -112,8 +112,16 @@ class ChangeLog $node = new StdClass(); $node->field = $key; $previousValue = !isset($this->values[$key]) ? null : $this->values[$key]; - $node->previousValue = (string) $previousValue; - $node->currentValue = (string) $value; + if(!is_array($previousValue)){ + $node->previousValue = (string) $previousValue; + } else { + $node->previousValue = "
".nl2br(print_r($previousValue, true)); + } + if(!is_array($value)){ + $node->currentValue = (string) $value; + } else { + $node->currentValue = "
".nl2br(print_r($value, true)); + } $node->previousValueType = gettype($previousValue); $node->currentValueType = gettype($value); $node->record = $this->getHistoryTitle($row); diff --git a/workflow/engine/templates/cases/caseChangeLog.js b/workflow/engine/templates/cases/caseChangeLog.js index ebdf9e95c..f9db839da 100644 --- a/workflow/engine/templates/cases/caseChangeLog.js +++ b/workflow/engine/templates/cases/caseChangeLog.js @@ -64,9 +64,7 @@ Ext.onReady(function () { sortable: false, dataIndex: 'previousValue', renderer: function (value, p, record) { - return ' ' + value; + return value; } }, { @@ -75,9 +73,7 @@ Ext.onReady(function () { sortable: false, dataIndex: 'currentValue', renderer: function (value, p, record) { - return ' ' + value; + return value; } }, {