diff --git a/workflow/engine/templates/triggers/triggers_CreateWizard.html b/workflow/engine/templates/triggers/triggers_CreateWizard.html
index 422318f11..5109b6d6b 100755
--- a/workflow/engine/templates/triggers/triggers_CreateWizard.html
+++ b/workflow/engine/templates/triggers/triggers_CreateWizard.html
@@ -117,8 +117,8 @@
value="{PMFUNTION}">
-
-
+
@@ -169,3 +169,4 @@
+
diff --git a/workflow/engine/templates/triggers/triggers_EditWizard.html b/workflow/engine/templates/triggers/triggers_EditWizard.html
index 0b79325c2..06642cd64 100644
--- a/workflow/engine/templates/triggers/triggers_EditWizard.html
+++ b/workflow/engine/templates/triggers/triggers_EditWizard.html
@@ -65,7 +65,7 @@
class="module_app_input___gray" id="TRI_TITLE"
name="TRI_TITLE" type="text" size="53" maxlength="255"
value='{TITLE_CONTENT}' style="" onkeypress="" />
-
@@ -124,9 +124,8 @@
value="{PMFUNTION}">
-
-
+
+
+
diff --git a/workflow/engine/xmlform/triggers/triggersCustom.xml b/workflow/engine/xmlform/triggers/triggersCustom.xml
index 749ee1bdb..59c4c38a3 100644
--- a/workflow/engine/xmlform/triggers/triggersCustom.xml
+++ b/workflow/engine/xmlform/triggers/triggersCustom.xml
@@ -20,7 +20,7 @@
-
+
Save
@@ -87,4 +87,4 @@ function cancel(){
}
]]>
-
\ No newline at end of file
+
diff --git a/workflow/engine/xmlform/triggers/triggers_Options.xml b/workflow/engine/xmlform/triggers/triggers_Options.xml
index b8cd977f1..d8b438b35 100644
--- a/workflow/engine/xmlform/triggers/triggers_Options.xml
+++ b/workflow/engine/xmlform/triggers/triggers_Options.xml
@@ -80,28 +80,60 @@
function triggerSave(form)
{
-
- var triUid = getField('TRI_UID').value;
- if(triUid==''){
- var triTitle =getField('TRI_TITLE').value;
+ var triUid = "";
+ if(document.getElementById('TRI_UID')) { // alert('alvaro2');
+ 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(form.action,'lookforNameTrigger','NAMETRIGGER='+encodeURIComponent(triTitle)+'&proUid='+encodeURIComponent(getField('PRO_UID').value),'POST') ;
+ }
+ 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;
+ alert(G_STRINGS.ID_EXIST_TRIGGERS);return false;
}else{
- ajax_post(form.action, form, 'POST');
- currentPopupWindow.remove();
- @#PAGED_TABLE_ID.refresh();
+ ajax_post(form.action, form, 'POST');
+ currentPopupWindow.remove();
+ @#PAGED_TABLE_ID.refresh();
}
- }else{
+ }else{ alert('alvaro888');
ajax_post(form.action, form, 'POST');
currentPopupWindow.remove();
@#PAGED_TABLE_ID.refresh();
}
}
+ //for trigger no wizard
+ function triggerSave1(form)
+ {
+ var triUid = "";
+ if(getField('TRI_UID')) { // alert('alvaro2');
+ var triUid = getField('TRI_UID').value;
+ }
+ if(triUid==''){
+ var triTitle =getField('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='+(getField('PRO_UID').value),'POST') ;
+ if(!reqName){
+ alert(G_STRINGS.ID_EXIST_TRIGGERS);return false;
+ }else{
+ ajax_post(form.action, form, 'POST');
+ currentPopupWindow.remove();
+ @#PAGED_TABLE_ID.refresh();
+ }
+ }else{ alert('alvaro888');
+ ajax_post(form.action, form, 'POST');
+ currentPopupWindow.remove();
+ @#PAGED_TABLE_ID.refresh();
+ }
+ }
+
+
+//end for trigger no wirzard
+
function triggerDelete(sUID) {
var validateResult;
@@ -145,4 +177,4 @@
-
\ No newline at end of file
+