diff --git a/workflow/engine/classes/class.dashletProcessMakerEnterprise.php b/workflow/engine/classes/class.dashletProcessMakerEnterprise.php index edc7347f2..7411c6067 100644 --- a/workflow/engine/classes/class.dashletProcessMakerEnterprise.php +++ b/workflow/engine/classes/class.dashletProcessMakerEnterprise.php @@ -115,18 +115,6 @@ class dashletProcessMakerEnterprise implements DashletInterface
-
- -
-
- Custom Case List Builder -
- Allows an admin to setup custom column views inside a user's cases boxes (inbox, draft, sent, etc).  Information from report tables or Dynaforms can then be displayed in the columns making the inbox experience more relevent and useful to the user. -
- Read More>> -
-
-
diff --git a/workflow/engine/classes/model/Dashboard.php b/workflow/engine/classes/model/Dashboard.php index fb38e1778..cef1366e1 100644 --- a/workflow/engine/classes/model/Dashboard.php +++ b/workflow/engine/classes/model/Dashboard.php @@ -35,9 +35,10 @@ class Dashboard extends BaseDashboard try { if (!isset($data['DAS_UID'])) { + + $dashboard = new Dashboard(); $data['DAS_UID'] = G::generateUniqueID(); $data['DAS_CREATE_DATE'] = date('Y-m-d H:i:s'); - $dashboard = new Dashboard(); $msg = 'Create '; } else { $msg = 'Update '; @@ -46,8 +47,11 @@ class Dashboard extends BaseDashboard 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'); - $data['DAS_TITLE'] = $filter ->validateInput($data['DAS_TITLE'], "string"); $dashboard->fromArray($data, BasePeer::TYPE_FIELDNAME); if ($dashboard->validate()) { $connection->begin(); diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/ProcessMap.php b/workflow/engine/src/ProcessMaker/BusinessModel/ProcessMap.php index 7685d656b..f3f13a078 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/ProcessMap.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/ProcessMap.php @@ -100,7 +100,7 @@ class ProcessMap $tmpData[2] = $laneset['bou_y']; $tmpData[3] = $laneset['bou_width']; $tmpData[4] = $laneset['bou_height']; - $tmpData[5] = $laneset['dat_type']; + //$tmpData[5] = $laneset['dat_type']; $tmpData[6] = $laneset['lns_name']; $tmpData[7] = ""; $tmpData[8] = $laneset['lns_uid']; @@ -399,7 +399,7 @@ class ProcessMap $tt = explode('_', $figure[7]); $this->print_text($img, $figure[6], 10, 90, $black, $font, $X1, $Y1, $X2, $Y2, $figure[0], $tt[0]); } else { - $this->print_text($img, $figure[6], 10, 90, $black, $font, $X1, $Y1, $X2, $Y2, $figure[0], $figure[5]); + $this->print_text($img, $figure[6], 10, 90, $black, $font, $X1, $Y1, $X2, $Y2, $figure[0]); } break; case 'bpmnLane': 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; } };