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

loading standalone gateways and events during export and import

Browse Source
This commit is contained in:
safan
2011-02-24 13:09:08 +00:00
parent eb77ec83a2
commit b5e131bc96
4 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
workflow/engine/classes/class.processes.php
View File

@@ -3056,8 +3056,9 @@ class Processes {
} }
} }
else*/ else*/
/*if(isset($oData->gateways))
$this->createGatewayRows($oData->gateways);*/ if(isset($oData->gateways))
$this->createGatewayRows($oData->gateways);
$this->createDynaformRows($oData->dynaforms); $this->createDynaformRows($oData->dynaforms);
$this->createInputRows($oData->inputs); $this->createInputRows($oData->inputs);

6
workflow/engine/classes/class.tasks.php
View File

@@ -415,7 +415,11 @@ class Tasks
$oGateway = new Gateway(); $oGateway = new Gateway();
if($oGateway->gatewayExists ($row['GAT_UID'])) if($oGateway->gatewayExists ($row['GAT_UID']))
$oGateway->remove($row['GAT_UID']); $oGateway->remove($row['GAT_UID']);
$res = $oGateway->createRow($row);
if($row['TAS_UID'] != '' && $row['GAT_NEXT_TASK'] != '')
continue;
else
$res = $oGateway->createRow($row);
} }
return; return;
} }

8
workflow/engine/templates/bpmn/ProcessMapContext.js
View File

@@ -154,14 +154,14 @@ ProcessMapContext.prototype.exportProcess= function()
frame : false, frame : false,
height : 200, height : 200,
defaultType : 'textfield', defaultType : 'textfield',
defaults : {width: 180}, width : 400,
buttonAlign : 'center', buttonAlign : 'center',
items: [ items: [
{ {
xtype : 'fieldset', xtype : 'fieldset',
bodyStyle :'padding:10px 10px 10px 10px;', bodyStyle :'padding:10px 10px 10px 20px;',
title : 'Process Info', title : 'Process Info',
width : 370, //width : 370,
collapsible: false, collapsible: false,
autoHeight : true, autoHeight : true,
buttonAlign: 'center', buttonAlign: 'center',
@@ -223,7 +223,7 @@ ProcessMapContext.prototype.exportProcess= function()
collapsible: false, collapsible: false,
maximizable: false, maximizable: false,
sizeable : false, sizeable : false,
width : 400, width : 420,
height : 210, height : 210,
resizable : false, resizable : false,
layout : 'fit', layout : 'fit',

30
workflow/engine/templates/bpmn/TaskContext.js
View File

@@ -1379,35 +1379,33 @@ TaskContext.prototype.saveTaskProperties= function()
alert(tas_start); alert(tas_start);
//Checking checkbox fields //Checking checkbox fields
// if(typeof tas_start != 'undefined' && tas_start != ''){ if(typeof tas_start != 'undefined' && tas_start != ''){
// if(tas_start == 'on') if(tas_start == 'on')
// saveTaskform['TAS_START'] = 'TRUE'; saveTaskform['TAS_START'] = 'TRUE';
// else }
// saveTaskform['TAS_START'] = 'FALSE'; else
// } saveTaskform['TAS_START'] = 'FALSE';
if(tas_start == 'on')
tas_start = true;
else if(typeof tas_start == 'undefined')
tas_start = false;
if(typeof tas_transfer_fly != 'undefined' && tas_transfer_fly != ''){ if(typeof tas_transfer_fly != 'undefined' && tas_transfer_fly != ''){
if(tas_transfer_fly == 'on') if(tas_transfer_fly == 'on')
saveTaskform['TAS_TRANSFER_FLY'] = 'TRUE'; saveTaskform['TAS_TRANSFER_FLY'] = 'TRUE';
else
saveTaskform['TAS_TRANSFER_FLY'] = 'FALSE';
} }
else
saveTaskform['TAS_TRANSFER_FLY'] = 'FALSE';
if(typeof send_email != 'undefined' && send_email != ''){ if(typeof send_email != 'undefined' && send_email != ''){
if(send_email == 'on') if(send_email == 'on')
saveTaskform['SEND_EMAIL'] = 'TRUE'; saveTaskform['SEND_EMAIL'] = 'TRUE';
else
send_email['SEND_EMAIL'] = 'FALSE';
} }
else
saveTaskform['SEND_EMAIL'] = 'FALSE';
if(typeof tas_type != 'undefined' && tas_type != ''){ if(typeof tas_type != 'undefined' && tas_type != ''){
if(tas_type == 'on') if(tas_type == 'on')
saveTaskform['TAS_TYPE'] = 'ADHOC'; saveTaskform['TAS_TYPE'] = 'ADHOC';
else
saveTaskform['TAS_TYPE'] = 'NORMAL';
} }
else
saveTaskform['TAS_TYPE'] = 'NORMAL';
var object_data = Ext.util.JSON.encode(saveTaskform); var object_data = Ext.util.JSON.encode(saveTaskform);