fernando/luos
1
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Marco Antonio Nina Mena
2015-05-13 17:17:12 -04:00
parent 71c7f7d127 2d20b5bcc8
commit d5e6d4dabc
4 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
workflow/engine/classes/class.dashletProcessMakerEnterprise.php
View File

@@ -115,18 +115,6 @@ class dashletProcessMakerEnterprise implements DashletInterface
<div id=\"container\">
<div id=\"page1\">
<div class=\"icon\">
<a href=\"http://processmaker.com/workflow-inbox-and-bpm-inbox\" target=\"_blank\"><img src=\"/images/dashlets/enterprise_list_builder.png\" /></a>
</div>
<div class=\"description\">
<a href=\"http://processmaker.com/workflow-inbox-and-bpm-inbox\" target=\"_blank\">Custom Case List Builder</a>
<br />
Allows an admin to setup custom column views inside a user's cases boxes (inbox, draft, sent, etc). &nbsp;Information from report tables or Dynaforms can then be displayed in the columns making the inbox experience more relevent and useful to the user.
<br />
<a href=\"http://processmaker.com/workflow-inbox-and-bpm-inbox\" target=\"_blank\">Read More&gt;&gt;</a>
</div>
<div class=\"clearf\"></div>
<div class=\"icon\">
<a href=\"http://processmaker.com/bpm-ldap-and-bpm-active-directory\" target=\"_blank\"><img src=\"/images/dashlets/enterprise_ldap.png\" /></a>
</div>

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

@@ -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();
$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_UPDATE_DATE'] = date('Y-m-d H:i:s');
$dashboard->fromArray($data, BasePeer::TYPE_FIELDNAME);
if ($dashboard->validate()) {
$connection->begin();

4
workflow/engine/src/ProcessMaker/BusinessModel/ProcessMap.php
View File

@@ -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':

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

@@ -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;
}
};