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

Saving sub process.. fixing extjs issue

Browse Source
This commit is contained in:
safan
2011-02-08 14:49:56 +00:00
parent 773e117301
commit d3ae26fa07
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/class.processMap.php
View File

@@ -5181,6 +5181,8 @@ class processMap {
//$aRow['SPROCESS_NAME'] = $aRow['TAS_TITLE']; //$aRow['SPROCESS_NAME'] = $aRow['TAS_TITLE'];
$aRow ['TAS_TITLE'] = $aRow ['CON_VALUE']; $aRow ['TAS_TITLE'] = $aRow ['CON_VALUE'];
$aRow ['SPROCESS_NAME'] = $aRow ['CON_VALUE']; $aRow ['SPROCESS_NAME'] = $aRow ['CON_VALUE'];
$lang = defined ( 'SYS_LANG') ? SYS_LANG : 'en';
$aRow ['PRO_TITLE'] = Content::load ( 'PRO_TITLE', '', $aRow ['PRO_UID'] , $lang );
if($sType == 0) if($sType == 0)
{ {

6
workflow/engine/methods/bpmn/processes_Ajax.php
View File

@@ -319,7 +319,7 @@ if ( isset ($_REQUEST['action']) ) {
require_once 'classes/model/SubProcess.php'; require_once 'classes/model/SubProcess.php';
$oOP = new SubProcess(); $oOP = new SubProcess();
$aData = array('SP_UID' => $_POST['SP_UID'],//G::generateUniqueID(), $aData = array('SP_UID' => $_POST['SP_UID'],//G::generateUniqueID(),
'PRO_UID' => $aTask['PRO_UID'], 'PRO_UID' => $_POST['PRO_UID'],
'TAS_UID' => $_POST['TASKS'], 'TAS_UID' => $_POST['TASKS'],
'PRO_PARENT' => $_POST['PRO_PARENT'], 'PRO_PARENT' => $_POST['PRO_PARENT'],
'TAS_PARENT' => $_POST['TAS_PARENT'], 'TAS_PARENT' => $_POST['TAS_PARENT'],
@@ -332,6 +332,10 @@ if ( isset ($_REQUEST['action']) ) {
'SP_GRID_IN' => ''); 'SP_GRID_IN' => '');
$oOP->update($aData); $oOP->update($aData);
require_once 'classes/model/Content.php';
$lang = defined ( 'SYS_LANG') ? SYS_LANG : 'en';
//$cont = Content::addContent( 'SP_TITLE', '', $_POST['form']['SP_UID'], $lang, $_POST['form']['SPROCESS_NAME'] );
$cont = Content::addContent( 'TAS_TITLE', '', $_POST['TAS_PARENT'], $lang, $_POST['SPROCESS_NAME'] );
break; break;
case'saveSubprocessDetails11': case'saveSubprocessDetails11':

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

@@ -2523,7 +2523,7 @@ TaskContext.prototype.editSubProcessProperties= function(_3525)
forceSelection: true, forceSelection: true,
editable: false, editable: false,
fieldLabel: 'Process', fieldLabel: 'Process',
name: 'PRO_UID', name: 'PRO_TITLE',
emptyText : 'Select Process', emptyText : 'Select Process',
displayField: 'PRO_TITLE', displayField: 'PRO_TITLE',
valueField: 'PRO_TITLE', valueField: 'PRO_TITLE',
@@ -2601,6 +2601,7 @@ TaskContext.prototype.editSubProcessProperties= function(_3525)
var response = action.response.responseText; var response = action.response.responseText;
var aData = Ext.util.JSON.decode(response); var aData = Ext.util.JSON.decode(response);
spUID = aData.data[0].SP_UID; spUID = aData.data[0].SP_UID;
proUID = aData.data[0].PRO_UID;
proParent = aData.data[0].PRO_PARENT; proParent = aData.data[0].PRO_PARENT;
spSync = aData.data[0].SP_SYNCHRONOUS; spSync = aData.data[0].SP_SYNCHRONOUS;
tasParent = aData.data[0].TAS_PARENT; tasParent = aData.data[0].TAS_PARENT;
@@ -2616,9 +2617,8 @@ TaskContext.prototype.editSubProcessProperties= function(_3525)
Ext.getCmp("variablein").show(); Ext.getCmp("variablein").show();
form.findField('SP_SYNCHRONOUS').setValue('Synchronous'); form.findField('SP_SYNCHRONOUS').setValue('Synchronous');
} }
form.findField('PRO_UID').setValue(action.result.data[0].PRO_UID); form.findField('PRO_TITLE').setValue(action.result.data[0].PRO_TITLE);
form.findField('SPROCESS_NAME').setValue(processName); form.findField('SPROCESS_NAME').setValue(processName);
//workflow.subProcessProperties = action.result.data[0];
}, },
failure:function(form, action) { failure:function(form, action) {
Ext.MessageBox.alert('Message', 'Load failed'); Ext.MessageBox.alert('Message', 'Load failed');
@@ -2626,7 +2626,6 @@ TaskContext.prototype.editSubProcessProperties= function(_3525)
}); });
subProcessProperties.render(document.body); subProcessProperties.render(document.body);
// workflow.subProcessProperties = subProcessProperties;
var window = new Ext.Window({ var window = new Ext.Window({
title: 'Task: ', title: 'Task: ',
@@ -2665,16 +2664,15 @@ TaskContext.prototype.editSubProcessProperties= function(_3525)
} }
var sProcessUID = getForm.SEL_PROCESS; var sProcessUID = getForm.SEL_PROCESS;
if(sProcessUID == '')
sProcessUID = proUID;
var sSPNAME = getForm.SPROCESS_NAME; var sSPNAME = getForm.SPROCESS_NAME;
var sSync = getForm.SP_SYNCHRONOUS; var sSync = getForm.SP_SYNCHRONOUS;
if(sSync == 'Synchronous') if(sSync == 1)
{
sSync = 1;
var varIn = Ext.util.JSON.encode(varIn1)+'|'+Ext.util.JSON.encode(varIn2); var varIn = Ext.util.JSON.encode(varIn1)+'|'+Ext.util.JSON.encode(varIn2);
}
else else
{ {
sSync = 0;
varIn = new Array(); varIn = new Array();
varIn[0] = ''; varIn[0] = '';
} }
@@ -2686,7 +2684,7 @@ TaskContext.prototype.editSubProcessProperties= function(_3525)
params: { params: {
action : 'saveSubprocessDetails', action : 'saveSubprocessDetails',
SP_UID : spUID, SP_UID : spUID,
TASKS : tasks, TASKS : tasks, //problem
PRO_UID : sProcessUID, PRO_UID : sProcessUID,
SPROCESS_NAME : sSPNAME, SPROCESS_NAME : sSPNAME,
PRO_PARENT : proParent, PRO_PARENT : proParent,
@@ -2697,6 +2695,7 @@ TaskContext.prototype.editSubProcessProperties= function(_3525)
}, },
success: function(response) { success: function(response) {
Ext.MessageBox.alert ('Status','Sub Process Properties has been saved successfully.'); Ext.MessageBox.alert ('Status','Sub Process Properties has been saved successfully.');
window.close();
} }
}); });