From 9f042150ae36aba18b6ad177b19fdc3397b77579 Mon Sep 17 00:00:00 2001 From: Marco Antonio Nina Mena Date: Mon, 11 May 2015 10:43:56 -0400 Subject: [PATCH 1/3] Improvement save active-deactive --- workflow/engine/classes/model/Dashboard.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/workflow/engine/classes/model/Dashboard.php b/workflow/engine/classes/model/Dashboard.php index fb38e1778..1dd0643a6 100644 --- a/workflow/engine/classes/model/Dashboard.php +++ b/workflow/engine/classes/model/Dashboard.php @@ -35,19 +35,21 @@ class Dashboard extends BaseDashboard try { if (!isset($data['DAS_UID'])) { + G::LoadSystem('inputfilter'); + $dashboard = new Dashboard(); + $filter = new InputFilter(); + $data['DAS_UID'] = G::generateUniqueID(); $data['DAS_CREATE_DATE'] = date('Y-m-d H:i:s'); - $dashboard = new Dashboard(); + + $data['DAS_TITLE'] = $filter ->validateInput($data['DAS_TITLE'], "string"); $msg = 'Create '; } else { $msg = 'Update '; $dashboard = DashboardPeer::retrieveByPK($data['DAS_UID']); } - G::LoadSystem('inputfilter'); - $filter = new InputFilter(); $data['DAS_UPDATE_DATE'] = date('Y-m-d H:i:s'); - $data['DAS_TITLE'] = $filter ->validateInput($data['DAS_TITLE'], "string"); $dashboard->fromArray($data, BasePeer::TYPE_FIELDNAME); if ($dashboard->validate()) { $connection->begin(); From 61309a79e045c7de4b3436e0f8ef9c9a1ac292f7 Mon Sep 17 00:00:00 2001 From: Marco Antonio Nina Mena Date: Mon, 11 May 2015 11:17:33 -0400 Subject: [PATCH 2/3] Improvement form dashboards active-deactive --- workflow/engine/classes/model/Dashboard.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/workflow/engine/classes/model/Dashboard.php b/workflow/engine/classes/model/Dashboard.php index 1dd0643a6..cef1366e1 100644 --- a/workflow/engine/classes/model/Dashboard.php +++ b/workflow/engine/classes/model/Dashboard.php @@ -35,20 +35,22 @@ class Dashboard extends BaseDashboard try { if (!isset($data['DAS_UID'])) { - G::LoadSystem('inputfilter'); - $dashboard = new Dashboard(); - $filter = new InputFilter(); + $dashboard = new Dashboard(); $data['DAS_UID'] = G::generateUniqueID(); $data['DAS_CREATE_DATE'] = date('Y-m-d H:i:s'); - - $data['DAS_TITLE'] = $filter ->validateInput($data['DAS_TITLE'], "string"); $msg = 'Create '; } else { $msg = 'Update '; $dashboard = DashboardPeer::retrieveByPK($data['DAS_UID']); } + G::LoadSystem('inputfilter'); + $filter = new InputFilter(); + if (isset($data['DAS_TITLE'])) { + $data['DAS_TITLE'] = $filter ->validateInput($data['DAS_TITLE'], "string"); + } + $data['DAS_UPDATE_DATE'] = date('Y-m-d H:i:s'); $dashboard->fromArray($data, BasePeer::TYPE_FIELDNAME); if ($dashboard->validate()) { From 07163561c3b16e00c9f390ebd57e537634debd5c Mon Sep 17 00:00:00 2001 From: Marco Antonio Nina Mena Date: Mon, 11 May 2015 11:40:20 -0400 Subject: [PATCH 3/3] Improvement edit dashboard rowdblclick --- workflow/engine/templates/strategicDashboard/dashboardList.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/templates/strategicDashboard/dashboardList.js b/workflow/engine/templates/strategicDashboard/dashboardList.js index a7c6ea72a..9b96258b5 100644 --- a/workflow/engine/templates/strategicDashboard/dashboardList.js +++ b/workflow/engine/templates/strategicDashboard/dashboardList.js @@ -311,7 +311,7 @@ newDashboard = function() { //Edit Dashboard Action editDashboard = function() { var rowSelected = infoGrid.getSelectionModel().getSelected(); - if (rowSelected){ + if (rowSelected && rowSelected.data.DAS_STATUS == 1 ){ location.href = 'formEditDashboard?DAS_UID=' + rowSelected.data.DAS_UID; } };