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

Merge pull request #2229 from gproly/BUG-13788

Browse Source 
BUG-13788 SOLVED Cuando se realiza cambios en el contenido de la ventana...
This commit is contained in:
julceslauhub
2014-01-14 09:51:03 -08:00
parent 5e091edef0 b7bad08ded
commit 7ca20324e7
4 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
workflow/engine/xmlform/steps/triggersAfter_Options.xml
View File

@@ -13,9 +13,16 @@
<JS type="javascript" replaceTags="1" showInTable="1"> <JS type="javascript" replaceTags="1" showInTable="1">
<![CDATA[ <![CDATA[
var windowCode = new Array();
function triggerEdit(sTRI_UID,modified){ function triggerEdit(sTRI_UID,modified){
if(parseInt(modified) == 0){ if(parseInt(modified) == 0){
window.open('@G::encryptlink(@#triggersEdit)?TRI_UID=' + sTRI_UID,'@G::LoadTranslation(ID_EDIT_TRIGGERS)'.replace(/\s/g,'_')+(function(s){var r='';for(var i in s)if(typeof s[i]=='string')r+=s[i].charCodeAt(0);return r;})(document.cookie)+sTRI_UID,'toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=950,height=570,top='+((screen.height-570)/2)+',left='+((screen.width-950)/2)).focus(); if ( !windowCode[sTRI_UID] ) {
var windowOpen = window.open('@G::encryptlink(@#triggersEdit)?TRI_UID=' + sTRI_UID,'@G::LoadTranslation(ID_EDIT_TRIGGERS)'.replace(/\s/g,'_')+(function(s){var r='';for(var i in s)if(typeof s[i]=='string')r+=s[i].charCodeAt(0);return r;})(document.cookie)+sTRI_UID,'toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=950,height=570,top='+((screen.height-570)/2)+',left='+((screen.width-950)/2));
windowOpen.focus();
windowCode[sTRI_UID]=windowOpen;
} else {
windowCode[sTRI_UID].focus();
}
} else { } else {
popupWindow('@G::LoadTranslation(ID_EDIT_TRIGGERS)', '@G::encryptlink(@#triggersEdit)?TRI_UID='+ sTRI_UID + '&STEP_UID=' + '@#STEP' + '&ST_TYPE=AFTER', 930, 600); popupWindow('@G::LoadTranslation(ID_EDIT_TRIGGERS)', '@G::encryptlink(@#triggersEdit)?TRI_UID='+ sTRI_UID + '&STEP_UID=' + '@#STEP' + '&ST_TYPE=AFTER', 930, 600);
} }

9
workflow/engine/xmlform/steps/triggersBefore_Options.xml
View File

@@ -12,9 +12,16 @@
<PAGED_TABLE_ID type="private"/> <PAGED_TABLE_ID type="private"/>
<JS type="javascript" replaceTags="1"> <JS type="javascript" replaceTags="1">
<![CDATA[ <![CDATA[
var windowCode = new Array();
function triggerEdit(sTRI_UID,modified){ function triggerEdit(sTRI_UID,modified){
if(parseInt(modified) == 0){ if(parseInt(modified) == 0){
window.open('@G::encryptlink(@#triggersEdit)?TRI_UID=' + sTRI_UID,'@G::LoadTranslation(ID_EDIT_TRIGGERS)'.replace(/\s/g,'_')+(function(s){var r='';for(var i in s)if(typeof s[i]=='string')r+=s[i].charCodeAt(0);return r;})(document.cookie)+sTRI_UID,'toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=950,height=570,top='+((screen.height-570)/2)+',left='+((screen.width-950)/2)).focus(); if ( !windowCode[sTRI_UID] ) {
var windowOpen = window.open('@G::encryptlink(@#triggersEdit)?TRI_UID=' + sTRI_UID,'@G::LoadTranslation(ID_EDIT_TRIGGERS)'.replace(/\s/g,'_')+(function(s){var r='';for(var i in s)if(typeof s[i]=='string')r+=s[i].charCodeAt(0);return r;})(document.cookie)+sTRI_UID,'toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=950,height=570,top='+((screen.height-570)/2)+',left='+((screen.width-950)/2));
windowOpen.focus();
windowCode[sTRI_UID]=windowOpen;
} else {
windowCode[sTRI_UID].focus();
}
} else { } else {
popupWindow('@G::LoadTranslation(ID_EDIT_TRIGGERS)', '@G::encryptlink(@#triggersEdit)?TRI_UID='+ sTRI_UID + '&STEP_UID=' + '@#STEP' + '&ST_TYPE=BEFORE', 930, 600); popupWindow('@G::LoadTranslation(ID_EDIT_TRIGGERS)', '@G::encryptlink(@#triggersEdit)?TRI_UID='+ sTRI_UID + '&STEP_UID=' + '@#STEP' + '&ST_TYPE=BEFORE', 930, 600);
} }

8
workflow/engine/xmlform/triggers/triggers_Edit.xml
View File

@@ -84,8 +84,16 @@ var insertFormVar = function(sFieldName, sValue) {
}; };
function cancel(){ function cancel(){
if(opener) {
opener.windowCode[document.getElementById('form[TRI_UID]').value] = false;
}
window.close(); window.close();
} }
window.onbeforeunload=function(){
if(opener) {
opener.windowCode[document.getElementById('form[TRI_UID]').value] = false;
}
};
function triggerSave1(form){ function triggerSave1(form){
ajax_post(form.action, form, 'POST'); ajax_post(form.action, form, 'POST');

9
workflow/engine/xmlform/triggers/triggers_Options.xml
View File

@@ -71,9 +71,16 @@
} }
} }
var windowCode = new Array();
function triggerEdit( sUID, modified) { function triggerEdit( sUID, modified) {
if(parseInt(modified) == 0){ if(parseInt(modified) == 0){
window.open('@G::encryptlink(@#triggersEdit)?TRI_UID='+ sUID,'@G::LoadTranslation(ID_EDIT_TRIGGERS)'.replace(/\s/g,'_')+(function(s){var r='';for(var i in s)if(typeof s[i]=='string')r+=s[i].charCodeAt(0);return r;})(document.cookie)+sUID,'toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=950,height=570,top='+((screen.height-570)/2)+',left='+((screen.width-950)/2)).focus(); if ( !windowCode[sUID] ) {
var windowOpen = window.open('@G::encryptlink(@#triggersEdit)?TRI_UID='+ sUID,'@G::LoadTranslation(ID_EDIT_TRIGGERS)'.replace(/\s/g,'_')+(function(s){var r='';for(var i in s)if(typeof s[i]=='string')r+=s[i].charCodeAt(0);return r;})(document.cookie)+sUID,'toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=950,height=570,top='+((screen.height-570)/2)+',left='+((screen.width-950)/2));
windowOpen.focus();
windowCode[sUID]=windowOpen;
} else {
windowCode[sUID].focus();
}
} else { } else {
popupWindow('@G::LoadTranslation(ID_EDIT_TRIGGERS)', '@G::encryptlink(@#triggersEdit)?TRI_UID='+ sUID, 930, 600); popupWindow('@G::LoadTranslation(ID_EDIT_TRIGGERS)', '@G::encryptlink(@#triggersEdit)?TRI_UID='+ sUID, 930, 600);
} }