From 4c590fcdf8519d33ee9deb4c1a181bb868117147 Mon Sep 17 00:00:00 2001 From: davidcallizaya Date: Thu, 24 Mar 2016 00:12:23 -0400 Subject: [PATCH] =?UTF-8?q?HOR-472=20Change=20log=20de=20dynaforms=20obtie?= =?UTF-8?q?ne=20un=20orden=20extra=C3=B1o=20de=20los=20cambios=20+=20Refac?= =?UTF-8?q?tor=20of=20ChangeLog=20History=20-=20Removed=20paging=20+=20Imp?= =?UTF-8?q?roved=20type=20style?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessModel/Cases/ChangeLog.php | 4 ---- .../engine/templates/cases/caseChangeLog.html | 7 ++++++ .../engine/templates/cases/caseChangeLog.js | 22 ++++++------------- 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Cases/ChangeLog.php b/workflow/engine/src/ProcessMaker/BusinessModel/Cases/ChangeLog.php index 675944771..a435e3789 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Cases/ChangeLog.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases/ChangeLog.php @@ -84,10 +84,6 @@ class ChangeLog $this->hasPermission($row['DYN_UID']), true); $limit-= $a; $index+= $a; - if ($limit < 0) { - $index+=1; - break; - } } return $index; } diff --git a/workflow/engine/templates/cases/caseChangeLog.html b/workflow/engine/templates/cases/caseChangeLog.html index dcc0a87f3..2ca2abb30 100644 --- a/workflow/engine/templates/cases/caseChangeLog.html +++ b/workflow/engine/templates/cases/caseChangeLog.html @@ -6,6 +6,13 @@ body{ color:black !important; } + button.typeButton{ + border-radius: 4px; + background-color: white; + border: 1px solid rgb(192, 192, 192); + font-size: 11px; + color: rgb(192, 192, 192); + }
diff --git a/workflow/engine/templates/cases/caseChangeLog.js b/workflow/engine/templates/cases/caseChangeLog.js index d1f4bbeb0..ebdf9e95c 100644 --- a/workflow/engine/templates/cases/caseChangeLog.js +++ b/workflow/engine/templates/cases/caseChangeLog.js @@ -64,9 +64,9 @@ Ext.onReady(function () { sortable: false, dataIndex: 'previousValue', renderer: function (value, p, record) { - return value + - ' '; + return ' ' + value; } }, { @@ -75,9 +75,9 @@ Ext.onReady(function () { sortable: false, dataIndex: 'currentValue', renderer: function (value, p, record) { - return value + - ' '; + return ' ' + value; } }, { @@ -88,15 +88,7 @@ Ext.onReady(function () { hideable: true, dataIndex: 'record' } - ]}), - "bbar": new Ext.PagingToolbar({ - pageSize: 15, - store: store, - displayInfo: true, - displayMsg: '{0} - {1}', - emptyMsg: "", - items: [] - }) + ]}) }) ]