diff --git a/workflow/engine/classes/model/DashletInstance.php b/workflow/engine/classes/model/DashletInstance.php index 1ce0b587d..0eb0a6d21 100644 --- a/workflow/engine/classes/model/DashletInstance.php +++ b/workflow/engine/classes/model/DashletInstance.php @@ -35,11 +35,13 @@ class DashletInstance extends BaseDashletInstance { try { if (!isset($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(); } else { $dashletInstance = DashletInstancePeer::retrieveByPK($data['DAS_INS_UID']); } + $data['DAS_INS_UPDATE_DATE'] = date('Y-m-d H:i:s'); $dashletInstance->fromArray($data, BasePeer::TYPE_FIELDNAME); if ($dashletInstance->validate()) { $connection->begin(); diff --git a/workflow/engine/templates/dashboard/dashletsList.js b/workflow/engine/templates/dashboard/dashletsList.js index 531ac72a0..75c632a90 100644 --- a/workflow/engine/templates/dashboard/dashletsList.js +++ b/workflow/engine/templates/dashboard/dashletsList.js @@ -316,47 +316,36 @@ editDashletInstance = function(){ //Delete Dashlet Instance Action deleteDashletInstance = function(){ var rowSelected = infoGrid.getSelectionModel().getSelected(); - /*if (rowSelected){ - viewport.getEl().mask(_('ID_PROCESSING')); - Ext.Ajax.request({ - url: 'deleteDashletInstance', - params: {dasInsUid: rowSelected.data.DAS_INS_UID}, - success: function(r,o){ - viewport.getEl().unmask(); - response = Ext.util.JSON.decode(r.responseText); - if (response.success){ - Ext.Msg.confirm(_('ID_CONFIRM'),_('ID_CONFIRM_DELETE_DASHLET_INSTANCE'),function(btn,text){ - if (btn=='yes'){ - viewport.getEl().mask(_('ID_PROCESSING')); - Ext.Ajax.request({ - url: 'deleteDashletInstance', - params: {dasInsUid : rowSelected.data.DAS_INS_UID}, - success: function(r,o){ - viewport.getEl().unmask(); - resp = Ext.util.JSON.decode(r.responseText); - if (resp.success){ - PMExt.notify(_('ID_DASHLET_INSTANCE'),_('ID_DASHLET_SUCCESS_DELETE')); - }else{ - PMExt.error(_('ID_DASHLET_INSTANCE'),resp.error); - } - //doSearch(); - editButton.disable(); - deleteButton.disable(); - }, - failure: function(r,o){ - viewport.getEl().unmask(); - } - }); + if (rowSelected){ + //Ext.Msg.confirm(_('ID_CONFIRM'), _('ID_CONFIRM_DELETE_DASHLET_INSTANCE'),function(btn, text) + Ext.Msg.confirm(_('ID_CONFIRM'), 'Do you want to delete this Dashlet Instance?', function(btn, text) + { + if (btn == 'yes') { + viewport.getEl().mask(_('ID_PROCESSING')); + Ext.Ajax.request({ + url: 'deleteDashletInstance', + params: {DAS_INS_UID: rowSelected.data.DAS_INS_UID}, + success: function(r, o){ + viewport.getEl().unmask(); + response = Ext.util.JSON.decode(r.responseText); + if (response.status == 'OK') { + //PMExt.notify(_('ID_DASHLET_INSTANCE'),_('ID_DASHLET_SUCCESS_DELETE')); + PMExt.notify('Dashlet Instance', 'Dashlet instance deleted sucessfully.'); } - }); - - }else{ - PMExt.error(_('ID_DASHLET_INSTANCE'),_('ID_MSG_CANNOT_DELETE_DASHLET')); + else { + //PMExt.error(_('ID_DASHLET_INSTANCE'), response.message); + PMExt.error('Dashlet Instance', response.message); + } + //doSearch(); + editButton.disable(); + deleteButton.disable(); + infoGrid.store.load(); + }, + failure: function(r, o){ + viewport.getEl().unmask(); } - }, - failure: function(r,o){ - viewport.getEl().unmask(); + }); } }); - }*/ + } };