diff --git a/workflow/engine/classes/class.pmDashlet.php b/workflow/engine/classes/class.pmDashlet.php index 7cd286a01..6ad95cadf 100644 --- a/workflow/engine/classes/class.pmDashlet.php +++ b/workflow/engine/classes/class.pmDashlet.php @@ -133,6 +133,7 @@ class PMDashlet extends DashletInstance implements DashletInterface { $criteria = new Criteria('workflow'); $criteria->addSelectColumn(DashletInstancePeer::DAS_INS_UID); $criteria->addSelectColumn(DashletPeer::DAS_TITLE); + $criteria->addSelectColumn(DashletInstancePeer::DAS_INS_CONTEXT_TIME); $criteria->add(DashletInstancePeer::DAS_INS_OWNER_TYPE, 'DEPARTMENT'); $criteria->add(DashletInstancePeer::DAS_INS_OWNER_UID, $depUid); $dataset = DashletInstancePeer::doSelectRS($criteria); @@ -140,6 +141,7 @@ class PMDashlet extends DashletInstance implements DashletInterface { $dataset->next(); while ($row = $dataset->getRow()) { if (!isset($dashletsInstances[$row['DAS_INS_UID']])) { + $row['DAS_TITLE'] .= ' (' . $row['DAS_INS_CONTEXT_TIME'] . ')'; $dashletsInstances[$row['DAS_INS_UID']] = $row; } $dataset->next(); diff --git a/workflow/engine/classes/model/DashletInstance.php b/workflow/engine/classes/model/DashletInstance.php index 0eb0a6d21..db188501a 100644 --- a/workflow/engine/classes/model/DashletInstance.php +++ b/workflow/engine/classes/model/DashletInstance.php @@ -34,6 +34,9 @@ class DashletInstance extends BaseDashletInstance { $connection = Propel::getConnection(DashletInstancePeer::DATABASE_NAME); try { if (!isset($data['DAS_INS_UID'])) { + $data['DAS_INS_UID'] = ''; + } + if ($data['DAS_INS_UID'] == '') { $data['DAS_INS_UID'] = G::generateUniqueID(); $data['DAS_INS_CREATE_DATE'] = date('Y-m-d H:i:s'); $dashletInstance = new DashletInstance(); diff --git a/workflow/engine/templates/dashboard/dashletsList.js b/workflow/engine/templates/dashboard/dashletsList.js index 75c632a90..1d1e28fd9 100644 --- a/workflow/engine/templates/dashboard/dashletsList.js +++ b/workflow/engine/templates/dashboard/dashletsList.js @@ -197,7 +197,7 @@ Ext.onReady(function(){ editable: false, listeners:{ select: function(c,d,i){ - UpdatePageConfig(d.data['size']); + //UpdatePageConfig(d.data['size']); bbarpaging.pageSize = parseInt(d.data['size']); bbarpaging.moveFirst(); } @@ -300,6 +300,14 @@ gridByDefault = function(){ infoGrid.store.load({params: {textFilter: searchText.getValue()}}); };*/ +//Update Page Size Configuration +/*updatePageConfig = function(pageSize) { + Ext.Ajax.request({ + url: 'updatePageConfig', + params: {size: pageSize} + }); +};*/ + //New Dashlet Instance Action newDashletInstance = function() { location.href = 'dashletInstanceForm';