fernando/luos
1
0
Fork 0
Code Releases Activity

Fixed problem creating triggers both wizard and no wizard

Browse Source
This commit is contained in:
Alvaro Campos
2011-01-17 13:53:45 +00:00
parent afcf856245
commit a386af9b63
4 changed files with 53 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
workflow/engine/templates/triggers/triggers_CreateWizard.html
View File

@@ -117,8 +117,8 @@
value="{PMFUNTION}"> value="{PMFUNTION}">
<input type="hidden" name="LIBRARY_CLASS" <input type="hidden" name="LIBRARY_CLASS"
value="{LIBRARY_CLASS}"> value="{LIBRARY_CLASS}">
<input type="hidden" name="PRO_UID" value="{PRO_UID}"> <input type="hidden" id="PRO_UID" name="PRO_UID" value="{PRO_UID}">
<input type="hidden" name="ALLFUNCTION" <input type="hidden" id="ALLFUNCTION" name="ALLFUNCTION"
value="{ALLFUNCTION}"> value="{ALLFUNCTION}">
<input type="hidden" name="PAGED_TABLE_ID" <input type="hidden" name="PAGED_TABLE_ID"
id="PAGED_TABLE_ID" value="{PAGED_TABLE_ID}"> id="PAGED_TABLE_ID" value="{PAGED_TABLE_ID}">
@@ -169,3 +169,4 @@
</td> </td>
</tr> </tr>
</table> </table>

8
workflow/engine/templates/triggers/triggers_EditWizard.html
View File

@@ -65,7 +65,7 @@
class="module_app_input___gray" id="TRI_TITLE" class="module_app_input___gray" id="TRI_TITLE"
name="TRI_TITLE" type="text" size="53" maxlength="255" name="TRI_TITLE" type="text" size="53" maxlength="255"
value='{TITLE_CONTENT}' style="" onkeypress="" /> value='{TITLE_CONTENT}' style="" onkeypress="" />
<input name="TRI_UID" type="hidden" <input name="TRI_UID" type="hidden" id="TRI_UID"
value='{TRI_UID}' style="" onkeypress="" /> value='{TRI_UID}' style="" onkeypress="" />
</td> </td>
</tr> </tr>
@@ -124,9 +124,8 @@
value="{PMFUNTION}"> value="{PMFUNTION}">
<input type="hidden" name="LIBRARY_CLASS" <input type="hidden" name="LIBRARY_CLASS"
value="{LIBRARY_CLASS}"> value="{LIBRARY_CLASS}">
<input type="hidden" name="PRO_UID" value="{PRO_UID}"> <input type="hidden" id="PRO_UID" name="PRO_UID" value="{PRO_UID}">
<input type="hidden" name="ALLFUNCTION" <input type="hidden" id="ALLFUNCTION" name="ALLFUNCTION" value="{ALLFUNCTION}">
value="{ALLFUNCTION}">
<input type="hidden" name="PAGED_TABLE_ID" <input type="hidden" name="PAGED_TABLE_ID"
id="PAGED_TABLE_ID" value="{PAGED_TABLE_ID}"> id="PAGED_TABLE_ID" value="{PAGED_TABLE_ID}">
<input type="hidden" name="LIBRARY_NAME" <input type="hidden" name="LIBRARY_NAME"
@@ -176,3 +175,4 @@
</td> </td>
</tr> </tr>
</table> </table>

4
workflow/engine/xmlform/triggers/triggersCustom.xml
View File

@@ -20,7 +20,7 @@
<TRI_WEBBOT type="textareapm" class="formLabel" cols="50" rows="15" width="100%" height="380px" showVars="1" process="@#PRO_UID"> <TRI_WEBBOT type="textareapm" class="formLabel" cols="50" rows="15" width="100%" height="380px" showVars="1" process="@#PRO_UID">
</TRI_WEBBOT> </TRI_WEBBOT>
<SAVE type="button" onclick="triggerSave(this.form);"> <SAVE type="button" onclick="triggerSave1(this.form);">
<en>Save</en> <en>Save</en>
</SAVE> </SAVE>
<BTN_CANCEL type="button" onclick="cancel();triggerFromLibrary()"> <BTN_CANCEL type="button" onclick="cancel();triggerFromLibrary()">
@@ -87,4 +87,4 @@ function cancel(){
} }
]]></JS> ]]></JS>
</dynaForm> </dynaForm>

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

@@ -80,28 +80,60 @@
function triggerSave(form) function triggerSave(form)
{ {
var triUid = "";
var triUid = getField('TRI_UID').value; if(document.getElementById('TRI_UID')) { // alert('alvaro2');
if(triUid==''){ var triUid = document.getElementById('TRI_UID').value;
var triTitle =getField('TRI_TITLE').value; }
if(triUid==''){
var triTitle =document.getElementById('TRI_TITLE').value;
if(triTitle==''){ if(triTitle==''){
alert(G_STRINGS.ID_REQUIRED_NAME_TRIGGERS);return false; 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){ if(!reqName){
alert(G_STRINGS.ID_EXIST_TRIGGERS);return false; alert(G_STRINGS.ID_EXIST_TRIGGERS);return false;
}else{ }else{
ajax_post(form.action, form, 'POST'); ajax_post(form.action, form, 'POST');
currentPopupWindow.remove(); currentPopupWindow.remove();
@#PAGED_TABLE_ID.refresh(); @#PAGED_TABLE_ID.refresh();
} }
}else{ }else{ alert('alvaro888');
ajax_post(form.action, form, 'POST'); ajax_post(form.action, form, 'POST');
currentPopupWindow.remove(); currentPopupWindow.remove();
@#PAGED_TABLE_ID.refresh(); @#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) { function triggerDelete(sUID) {
var validateResult; var validateResult;
@@ -145,4 +177,4 @@
<SEARCH_FILTER_FORM type="private"/> <SEARCH_FILTER_FORM type="private"/>
</dynaForm> </dynaForm>