From 71e744043b180639bff2aaae37adada15ecf92ba Mon Sep 17 00:00:00 2001 From: Hector Cortez Date: Wed, 14 Dec 2011 12:23:48 -0400 Subject: [PATCH] BUG 8175 Adjustment to loaded, form of triggers in trigger tab. --- .../triggers/triggers_EditWizard.html | 2 +- .../engine/xmlform/steps/steps_Options.xml | 59 +++++++++++++++++++ 2 files changed, 60 insertions(+), 1 deletion(-) diff --git a/workflow/engine/templates/triggers/triggers_EditWizard.html b/workflow/engine/templates/triggers/triggers_EditWizard.html index 06642cd64..15b815bc2 100755 --- a/workflow/engine/templates/triggers/triggers_EditWizard.html +++ b/workflow/engine/templates/triggers/triggers_EditWizard.html @@ -139,7 +139,7 @@ + onclick="currentPopupWindow.remove(); if(typeof triggerFromLibrary == 'function'){ triggerFromLibrary(); } return false;" /> diff --git a/workflow/engine/xmlform/steps/steps_Options.xml b/workflow/engine/xmlform/steps/steps_Options.xml index af4d64498..0c8370182 100755 --- a/workflow/engine/xmlform/steps/steps_Options.xml +++ b/workflow/engine/xmlform/steps/steps_Options.xml @@ -21,6 +21,8 @@ + + @@ -70,6 +72,63 @@ window.location.href = "@G::encryptlink(@#URL_DYNAFORM_EDITOR)?PRO_UID="+pro_uid+"&DYN_UID="+uid; } + // Additional functions required in triggers + function triggerEditWizardSource (sUID){ + popupWindow('@G::LoadTranslation(ID_EDIT_TRIGGERS)', '@G::encryptlink(@#triggersEdit)?TRI_UID=' + sUID +'&BYPASS=1' , 770, 510); + } + + function triggerSave(form) + { + var triUid = ""; + if(document.getElementById('TRI_UID')) { + var triUid = document.getElementById('TRI_UID').value; + } + if(triUid==''){ + var triTitle =document.getElementById('TRI_TITLE').value; + if(triTitle==''){ + alert(G_STRINGS.ID_REQUIRED_NAME_TRIGGERS); + return false; + } + reqName=ajax_function("../triggers/triggers_Save",'lookforNameTrigger','NAMETRIGGER='+encodeURIComponent(triTitle)+'&proUid='+(document.getElementById('PRO_UID').value),'POST'); + if(!reqName){ + alert(G_STRINGS.ID_EXIST_TRIGGERS); + return false; + } else { + ajax_post(form.action, form, 'POST'); + currentPopupWindow.remove(); + } + } else { + ajax_post(form.action, form, 'POST'); + currentPopupWindow.remove(); + } + } + + function triggerSave1(form) + { + var triUid = ""; + if(getField('TRI_UID')) { + var triUid = getField('TRI_UID').value; + } + if(triUid == ''){ + var triTitle =getField('TRI_TITLE').value.trim(); + if(triTitle==''){ + alert(G_STRINGS.ID_REQUIRED_NAME_TRIGGERS); + return false; + } + reqName=ajax_function("../triggers/triggers_Save",'lookforNameTrigger','NAMETRIGGER='+encodeURIComponent(triTitle)+'&proUid='+(getField('PRO_UID').value),'POST'); + if(!reqName){ + alert(G_STRINGS.ID_EXIST_TRIGGERS); + return false; + } else { + ajax_post(form.action, form, 'POST'); + currentPopupWindow.remove(); + } + } else { + ajax_post(form.action, form, 'POST'); + currentPopupWindow.remove(); + } + } + ]]> \ No newline at end of file