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

Merge remote branch 'upstream/master' into BUG-9319

Browse Source
This commit is contained in:
Victor Saisa Lopez
2012-07-02 11:29:52 -04:00
parent 5d42e0d329 d331965cc9
commit b7fa89397a
7 changed files with 181 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
workflow/engine/js/processmap/core/processes_Map.js
View File

@@ -21,6 +21,17 @@ var saveDataTaskTemporal = function(iForm)
oTaskData.TAS_START = (getField('TAS_START').checked ? 'TRUE' : 'FALSE');
oTaskData.TAS_PRIORITY_VARIABLE = getField('TAS_PRIORITY_VARIABLE').value;
oTaskData.TAS_DERIVATION_SCREEN_TPL = getField('TAS_DERIVATION_SCREEN_TPL').value;
var fieldEval = new input(getField('TAS_TITLE'));
if (getField('TAS_TITLE').value.trim() == '') {
fieldEval.failed();
new leimnud.module.app.alert().make( {
label : _('ID_NAME_TAS_TITLE_REQUIRE')
});
return false;
} else {
fieldEval.passed();
}
break;
case 2:
case '2':
@@ -65,6 +76,17 @@ var saveDataTaskTemporal = function(iForm)
oTaskData.TAS_TYPE_DAY = getField('TAS_TYPE_DAY').value;
oTaskData.TAS_CALENDAR = getField('TAS_CALENDAR').value;
oTaskData.TAS_TRANSFER_FLY = (getField('TAS_TRANSFER_FLY').checked ? 'TRUE' : 'FALSE');
var fieldEval = new input(getField('TAS_DURATION'));
if (getField('TAS_DURATION').value.trim() == '') {
fieldEval.failed();
new leimnud.module.app.alert().make( {
label : _('ID_TAS_DURATION_REQUIRE')
});
return false;
} else {
fieldEval.passed();
}
break;
case 4:
case '4':
@@ -91,41 +113,56 @@ var saveDataTaskTemporal = function(iForm)
case 7:
case '7':
if ( getField('SEND_EMAIL') != null && (typeof (getField('SEND_EMAIL')) != 'undefined' ) ) {
oTaskData.SEND_EMAIL = getField('SEND_EMAIL').checked ? 'TRUE' : 'FALSE';
oTaskData.TAS_DEF_MESSAGE_TYPE = getField('TAS_DEF_MESSAGE_TYPE').value;
oTaskData.TAS_DEF_MESSAGE = getField('TAS_DEF_MESSAGE').value.replace(re, "@amp@");
oTaskData.TAS_DEF_SUBJECT_MESSAGE = getField('TAS_DEF_SUBJECT_MESSAGE').value;
oTaskData.TAS_DEF_MESSAGE_TEMPLATE = getField('TAS_DEF_MESSAGE_TEMPLATE').value;
// validate fields TAS_DEF_SUBJECT_MESSAGE, TAS_DEF_MESSAGE
if (getField('SEND_EMAIL').checked) {
var fieldEval = new input(getField('TAS_DEF_SUBJECT_MESSAGE'));
if (getField('TAS_DEF_SUBJECT_MESSAGE').value.trim() == '') {
fieldEval.failed();
new leimnud.module.app.alert().make( {
label : G_STRINGS.ID_SUBJECT_FIELD_REQUIRED
});
return false;
} else {
fieldEval.passed();
}
switch ( getField('TAS_DEF_MESSAGE_TYPE').value ) {
switch (getField('TAS_DEF_MESSAGE_TYPE').value) {
case 'text' :
var vmesn = new input(getField('TAS_DEF_MESSAGE'));
if (getField('TAS_DEF_MESSAGE').value.trim() == '' ) {
vmesn.failed();
new leimnud.module.app.alert().make( {
label : G_STRINGS.ID_MESSAGE_FIELD_REQUIRED
});
return false;
} else {
vmesn.passed();
}
break;
case 'template' :
if (getField('TAS_DEF_MESSAGE_TEMPLATE').value.trim() == '' ){
var vmesn = new input(getField('TAS_DEF_MESSAGE_TEMPLATE'));
if (getField('TAS_DEF_MESSAGE_TEMPLATE').value.trim() == ''){
vmesn.failed();
new leimnud.module.app.alert().make( {
label : G_STRINGS.ID_TEMPLATE_FIELD_REQUIRED
});
return false;
} else {
vmesn.passed();
}
break;
}
}
if(typeof getField('SEND_EMAIL') != 'undefined' )
if(typeof getField('SEND_EMAIL') != 'undefined')
oTaskData.SEND_EMAIL = getField('SEND_EMAIL').checked ? 'TRUE' : 'FALSE';
else
oTaskData.SEND_EMAIL = 'FALSE';
oTaskData.TAS_DEF_MESSAGE = getField('TAS_DEF_MESSAGE').value.replace(re, "@amp@");
oTaskData.TAS_DEF_SUBJECT_MESSAGE = getField('TAS_DEF_SUBJECT_MESSAGE').value.replace(re, "@amp@");
oTaskData.TAS_DEF_MESSAGE_TYPE = getField('TAS_DEF_MESSAGE_TYPE').value;
oTaskData.TAS_DEF_MESSAGE_TEMPLATE = getField('TAS_DEF_MESSAGE_TEMPLATE').value;
}
break;
}

14
workflow/engine/js/processmap/core/processmap.js
View File

@@ -1571,7 +1571,19 @@ var processmap=function(){
{simage:"/images/properties.png",text:G_STRINGS.ID_PROCESSMAP_PROPERTIES,launch:this.parent.closure({instance:this,method:function(index){
var panel;
var iForm=function(panel,index,ifo){
saveDataTaskTemporal(ifo);
//saveDataTaskTemporal(ifo);
if(typeof(panel.flag) == 'undefined') {
if (!saveDataTaskTemporal(ifo)) {
var tabPass = panel.tabSelected;
panel.tabSelected = panel.tabLastSelected;
panel.tabLastSelected = tabPass;
panel.flag = true;
panel.makeTab();
return false;
}
}
delete panel.flag;
panel.command(panel.loader.show);
var r = new this.parent.module.rpc.xmlhttp({
url:this.options.dataServer,