fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HOR-826

Browse Source 
HOR-826
This commit is contained in:
Paula V. Quispe
2016-04-21 14:51:00 -04:00
parent a967986172
commit 5a96935aa7
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
workflow/engine/src/ProcessMaker/BusinessModel/Cases/ChangeLog.php
View File

@@ -112,8 +112,16 @@ class ChangeLog
$node = new StdClass(); $node = new StdClass();
$node->field = $key; $node->field = $key;
$previousValue = !isset($this->values[$key]) ? null : $this->values[$key]; $previousValue = !isset($this->values[$key]) ? null : $this->values[$key];
$node->previousValue = (string) $previousValue; if(!is_array($previousValue)){
$node->currentValue = (string) $value; $node->previousValue = (string) $previousValue;
} else {
$node->previousValue = "<br />".nl2br(print_r($previousValue, true));
}
if(!is_array($value)){
$node->currentValue = (string) $value;
} else {
$node->currentValue = "<br />".nl2br(print_r($value, true));
}
$node->previousValueType = gettype($previousValue); $node->previousValueType = gettype($previousValue);
$node->currentValueType = gettype($value); $node->currentValueType = gettype($value);
$node->record = $this->getHistoryTitle($row); $node->record = $this->getHistoryTitle($row);

8
workflow/engine/templates/cases/caseChangeLog.js
View File

@@ -64,9 +64,7 @@ Ext.onReady(function () {
sortable: false, sortable: false,
dataIndex: 'previousValue', dataIndex: 'previousValue',
renderer: function (value, p, record) { renderer: function (value, p, record) {
return ' <button disabled="disabled" class="typeButton">' return value;
+ record.data.previousValueType
+ '</button> ' + value;
} }
}, },
{ {
@@ -75,9 +73,7 @@ Ext.onReady(function () {
sortable: false, sortable: false,
dataIndex: 'currentValue', dataIndex: 'currentValue',
renderer: function (value, p, record) { renderer: function (value, p, record) {
return ' <button disabled="disabled" class="typeButton">' return value;
+ record.data.currentValueType
+ '</button> ' + value;
} }
}, },
{ {