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

Merge pull request #2176 from gproly/BUG-12604-12174-13122_v2

Browse Source 
Bug 12604 12174 13122 v2
This commit is contained in:
julceslauhub
2013-11-29 06:25:17 -08:00
parent 95c503dad7 fcf9175bc8
commit 45d9201241
12 changed files with 75 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
workflow/engine/xmlform/steps/steps_Options.xml
View File

@@ -73,11 +73,11 @@
}
// Additional functions required in triggers
function triggerEditWizardSource (sUID){
window.open('@G::encryptlink(@#triggersEdit)?TRI_UID=' + sUID +'&BYPASS=1','@G::LoadTranslation(ID_EDIT_TRIGGERS)'.replace(/\s/g,'_'),'toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width='+screen.width+',height='+screen.height);
function triggerEditWizardSource (sUID,STEP_UID,ST_TYPE){
window.open('@G::encryptlink(@#triggersEdit)?TRI_UID='+ sUID +'&BYPASS=1&STEP_UID='+STEP_UID+'&ST_TYPE='+ST_TYPE,'@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();
}
function triggerSave(form)
function triggerSave(form,STEP_UID,ST_TYPE)
{
var triUid = "";
if(document.getElementById('TRI_UID')) {
@@ -101,6 +101,7 @@
ajax_post(form.action, form, 'POST');
currentPopupWindow.remove();
}
showTriggers(STEP_UID,ST_TYPE);
}
function triggerSave1(form)

4
workflow/engine/xmlform/steps/triggersAfter_List.xml
View File

@@ -5,6 +5,8 @@
<TRI_UID type="hidden" showInTable="0"/>
<TRI_LOCATE_WEBBOT_PARAM type="hidden" showInTable="0"/>
<ST_POSITION type="hidden" showInTable="0"/>
<TRI_TITLE type="text" colWidth="400" titleAlign="left" align="left">
@@ -13,7 +15,7 @@
<triggersEdit type="hidden" defaultValue="../triggers/triggers_Edit"/>
<EDIT type="link" colWidth="" value="@G::LoadTranslation(ID_EDIT)" link="#" onclick="window.open('@G::encryptlink(@#triggersEdit)?TRI_UID=' + @QTRI_UID,'@G::LoadTranslation(ID_EDIT_TRIGGERS)'.replace(/\s/g,'_'),'toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width='+screen.width+',height='+screen.height); return false;"/>
<EDIT type="link" colWidth="" value="@G::LoadTranslation(ID_EDIT)" link="#" onclick="triggerEdit(@QTRI_UID,@QTRI_LOCATE_WEBBOT_PARAM); return false;"/>
<CONDITION type="link" colWidth="" value="@G::LoadTranslation(ID_CONDITION)" link="#" onclick="editTriggerCondition(@QSTEP_UID, @QTRI_UID, &#039;AFTER&#039;);return false;"/>

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

@@ -7,7 +7,20 @@
<en>Add</en>
</MNU_ADD>
<triggersEdit type="private" defaultValue="../triggers/triggers_Edit"/>
<PAGED_TABLE_ID type="private"/>
<JS type="javascript" replaceTags="1" showInTable="1">
<![CDATA[
function triggerEdit(sTRI_UID,modified){
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();
} else {
popupWindow('@G::LoadTranslation(ID_EDIT_TRIGGERS)', '@G::encryptlink(@#triggersEdit)?TRI_UID='+ sTRI_UID + '&STEP_UID=' + @#STEP + '&ST_TYPE=AFTER', 930, 600);
}
}
]]>
</JS>
</dynaForm>

5
workflow/engine/xmlform/steps/triggersBefore_List.xml
View File

@@ -5,6 +5,8 @@
<TRI_UID type="hidden" showInTable="0"/>
<TRI_LOCATE_WEBBOT_PARAM type="hidden" showInTable="0"/>
<ST_POSITION type="hidden" showInTable="0"/>
<TRI_TITLE type="text" colWidth="400" titleAlign="left" align="left">
@@ -13,7 +15,7 @@
<triggersEdit type="hidden" defaultValue="../triggers/triggers_Edit"/>
<EDIT type="link" colWidth="" value="@G::LoadTranslation(ID_EDIT)" link="#" onclick="window.open('@G::encryptlink(@#triggersEdit)?TRI_UID=' + @QTRI_UID,'@G::LoadTranslation(ID_EDIT_TRIGGERS)'.replace(/\s/g,'_'),'toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width='+screen.width+',height='+screen.height); return false;"/>
<EDIT type="link" colWidth="" value="@G::LoadTranslation(ID_EDIT)" link="#" onclick="triggerEdit(@QTRI_UID,@QTRI_LOCATE_WEBBOT_PARAM); return false;"/>
<CONDITION type="link" colWidth="" value="@G::LoadTranslation(ID_CONDITION)" link="#" onclick="editTriggerCondition(@QSTEP_UID, @QTRI_UID, &#039;BEFORE&#039;);return false;"/>
@@ -22,4 +24,5 @@
<DOWN type="link" colWidth="" value="@G::LoadTranslation(ID_DOWN)" link="#" onclick="downTrigger(@QSTEP_UID, @QTRI_UID, &#039;BEFORE&#039;, @QST_POSITION);return false;"/>
<DELETE type="link" colWidth="" value="@G::LoadTranslation(ID_DE_ASSIGN)" link="#" onclick="ofToAssignTrigger(@QSTEP_UID, @QTRI_UID, &#039;BEFORE&#039;, @QST_POSITION);return false;"><en></en></DELETE>
</dynaForm>

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

@@ -7,7 +7,19 @@
<en>Add</en>
</MNU_ADD>
<PAGED_TABLE_ID type="private"/>
<triggersEdit type="private" defaultValue="../triggers/triggers_Edit"/>
<PAGED_TABLE_ID type="private"/>
<JS type="javascript" replaceTags="1">
<![CDATA[
function triggerEdit(sTRI_UID,modified){
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();
} else {
popupWindow('@G::LoadTranslation(ID_EDIT_TRIGGERS)', '@G::encryptlink(@#triggersEdit)?TRI_UID='+ sTRI_UID + '&STEP_UID=' + @#STEP + '&ST_TYPE=BEFORE', 930, 600);
}
}
]]>
</JS>
</dynaForm>

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

@@ -7,6 +7,10 @@
<TRI_TYPE type="hidden"/>
<STEP_UID type="hidden"/>
<ST_TYPE type="hidden"/>
<TRI_WEBBOT type="textareapm" class="formLabel" cols="115" rows="28" width="100%" height="380px" showVars="1" process="@#PRO_UID">
</TRI_WEBBOT>
@@ -84,8 +88,12 @@ function cancel(){
}
function triggerSave1(form){
window.close();
ajax_post(form.action, form, 'POST');
if(@QSTEP_UID!="" && @QST_TYPE!="" && opener.showTriggers)
opener.showTriggers(@QSTEP_UID,@QST_TYPE);
if(opener.reloadTriggersShortList)
opener.reloadTriggersShortList();
window.close();
}
]]></JS>

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

@@ -41,7 +41,7 @@
var windowHeight = 460;
function triggerEditWizardSource (sUID){
popupWindow('@G::LoadTranslation(ID_EDIT_TRIGGERS)', '@G::encryptlink(@#triggersEdit)?TRI_UID=' + sUID +'&BYPASS=1' , 770, 510);
window.open('@G::encryptlink(@#triggersEdit)?TRI_UID='+ sUID +'&BYPASS=1','@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();
}
function triggerNew() {
@@ -71,8 +71,12 @@
}
}
function triggerEdit(sUID) {
window.open('@G::encryptlink(@#triggersEdit)?TRI_UID='+ sUID,'@G::LoadTranslation(ID_EDIT_TRIGGERS)'.replace(/\s/g,'_'),'toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width='+screen.width+',height='+screen.height);
function triggerEdit( sUID, modified) {
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();
} else {
popupWindow('@G::LoadTranslation(ID_EDIT_TRIGGERS)', '@G::encryptlink(@#triggersEdit)?TRI_UID='+ sUID, 930, 600);
}
}
function triggerProperties( sUID ) {
@@ -198,6 +202,13 @@
function triggerNewWizard(nameFunction, library) {//alert('@G::encryptlink(@#triggerNewWizard)?PRO_UID=@%PRO_UID&amp;NAME_FUN='+nameFunction+'&amp; PARAMETERS_FUN='+parametersFunct+'&amp;PAGED_TABLE_ID='+@#PAGED_TABLE_ID);return;
popupWindow('@G::LoadTranslation(ID_NEW_TRIGGERS)', '@G::encryptlink(@#triggerNewWizard)?PRO_UID=@%PRO_UID&NAME_FUN='+nameFunction+'&LIBRARY='+library+'&PAGED_TABLE_ID='+@#PAGED_TABLE_ID , 600, 600);
}
function reloadTriggersShortList(){
//@#PAGED_TABLE_ID.refresh();
if(Pm.panels.buildingBlocks){
Pm.data.render.buildingBlocks.injector('triggers');
}
}
]]>
</JS>

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

@@ -3,11 +3,13 @@
<TRI_UID type="hidden" showInTable="0"/>
<TRI_LOCATE_WEBBOT_PARAM type="hidden" showInTable="0"/>
<TRI_TITLE type="text" colWidth="350" titleAlign="left" align="left">
<en>Title</en>
</TRI_TITLE>
<EDIT type="link" colWidth="40" value="@G::LoadTranslation(ID_EDIT)" link="#" onclick="triggerEdit(@QTRI_UID);return false;"/>
<EDIT type="link" colWidth="40" value="@G::LoadTranslation(ID_EDIT)" link="#" onclick="triggerEdit(@QTRI_UID,@QTRI_LOCATE_WEBBOT_PARAM); return false;"/>
<PROPERTIES type="link" colWidth="40" value="@G::LoadTranslation(ID_PROPERTIES)" link="#" onclick="triggerProperties(@QTRI_UID);return false;"/>