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

Merged in dashboards2 (pull request #2175)

Browse Source 
Ticket 2698
This commit is contained in:
Julio Cesar Laura Avendaño
2015-05-13 12:11:06 -04:00
parent 5806b2206a d71473181d
commit 2897cc87e2
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
workflow/engine/classes/model/Dashboard.php
View File

@@ -35,9 +35,10 @@ class Dashboard extends BaseDashboard
try { try {
if (!isset($data['DAS_UID'])) { if (!isset($data['DAS_UID'])) {
$dashboard = new Dashboard();
$data['DAS_UID'] = G::generateUniqueID(); $data['DAS_UID'] = G::generateUniqueID();
$data['DAS_CREATE_DATE'] = date('Y-m-d H:i:s'); $data['DAS_CREATE_DATE'] = date('Y-m-d H:i:s');
$dashboard = new Dashboard();
$msg = 'Create '; $msg = 'Create ';
} else { } else {
$msg = 'Update '; $msg = 'Update ';
@@ -46,8 +47,11 @@ class Dashboard extends BaseDashboard
G::LoadSystem('inputfilter'); G::LoadSystem('inputfilter');
$filter = new InputFilter(); $filter = new InputFilter();
$data['DAS_UPDATE_DATE'] = date('Y-m-d H:i:s'); if (isset($data['DAS_TITLE'])) {
$data['DAS_TITLE'] = $filter ->validateInput($data['DAS_TITLE'], "string"); $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); $dashboard->fromArray($data, BasePeer::TYPE_FIELDNAME);
if ($dashboard->validate()) { if ($dashboard->validate()) {
$connection->begin(); $connection->begin();

2
workflow/engine/templates/strategicDashboard/dashboardList.js
View File

@@ -311,7 +311,7 @@ newDashboard = function() {
//Edit Dashboard Action //Edit Dashboard Action
editDashboard = function() { editDashboard = function() {
var rowSelected = infoGrid.getSelectionModel().getSelected(); var rowSelected = infoGrid.getSelectionModel().getSelected();
if (rowSelected){ if (rowSelected && rowSelected.data.DAS_STATUS == 1 ){
location.href = 'formEditDashboard?DAS_UID=' + rowSelected.data.DAS_UID; location.href = 'formEditDashboard?DAS_UID=' + rowSelected.data.DAS_UID;
} }
}; };