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

Validación de Trigger Wizard, Popup, Steps

Browse Source
This commit is contained in:
Roly Rudy Gutierrez Pinto
2013-11-28 17:05:58 -04:00
parent 645d43cb82
commit fcf9175bc8
12 changed files with 72 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
workflow/engine/classes/class.processMap.php
View File

@@ -891,6 +891,7 @@ class processMap
$oCriteria->addSelectColumn('C.CON_VALUE');
$oCriteria->addSelectColumn('STEP_UID');
$oCriteria->addSelectColumn('TRI_UID');
$oCriteria->addAsColumn('TRI_LOCATE_WEBBOT_PARAM', '(SELECT LOCATE(MD5(' . TriggersPeer::TRI_WEBBOT . '),' . TriggersPeer::TRI_PARAM . ') FROM ' . TriggersPeer::TABLE_NAME . ' WHERE ' . TriggersPeer::TRI_UID . '=' . StepTriggerPeer::TRI_UID . ' )');
$oCriteria->addSelectColumn('ST_TYPE');
$oCriteria->addSelectColumn(StepTriggerPeer::ST_POSITION);
$oCriteria->addAsColumn('TRI_TITLE', 'C.CON_VALUE');
@@ -2165,7 +2166,7 @@ class processMap
$oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(TriggersPeer::TRI_UID);
$oCriteria->addSelectColumn(TriggersPeer::PRO_UID);
$oCriteria->addAsColumn('TRI_LOCATE_WEBBOT_PARAM', 'LOCATE(' . TriggersPeer::TRI_WEBBOT . ',' . TriggersPeer::TRI_PARAM . ')');
$oCriteria->addAsColumn('TRI_LOCATE_WEBBOT_PARAM', 'LOCATE(MD5(' . TriggersPeer::TRI_WEBBOT . '),' . TriggersPeer::TRI_PARAM . ')');
$oCriteria->addAsColumn('TRI_TITLE', 'C1.CON_VALUE');
$oCriteria->addAsColumn('TRI_DESCRIPTION', 'C2.CON_VALUE');
$oCriteria->addAlias('C1', 'CONTENT');

6
workflow/engine/methods/triggers/triggers_Edit.php
View File

@@ -42,8 +42,12 @@ if (isset( $_GET['TRI_UID'] )) {
// if the trigger has been modified manually, it cant be edited with the wizard.
if (md5( $aFields['TRI_WEBBOT'] ) == $aTriggerData['hash']) {
$triUid = $_GET['TRI_UID'];
$STEP_UID = isset($_GET['STEP_UID'])?$_GET['STEP_UID']:'';
$ST_TYPE = isset($_GET['ST_TYPE'])?$_GET['ST_TYPE']:'';
$_GET = $aTriggerData['params'];
$_GET['TRI_UID'] = $triUid;
$_GET['STEP_UID']=$STEP_UID;
$_GET['ST_TYPE']=$ST_TYPE;
require_once ('triggers_EditWizard.php');
die();
} else {
@@ -63,6 +67,8 @@ if (isset( $_GET['TRI_UID'] )) {
$xmlform = 'triggers/triggersProperties';
$xmlform_action = '../triggers/triggers_Save';
}
$aFields['STEP_UID'] = isset($_GET['STEP_UID'])?$_GET['STEP_UID']:'';
$aFields['ST_TYPE'] = isset($_GET['ST_TYPE'])?$_GET['ST_TYPE']:'';
G::LoadClass( 'xmlfield_InputPM' );
$G_PUBLISH = new Publisher();
$G_PUBLISH->AddContent( 'xmlform', 'xmlform', $xmlform, '', $aFields, $xmlform_action );

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

@@ -34,8 +34,8 @@
<table border="0" cellpadding="0" cellspacing="0">
<tr>
<td nowrap valign="top">
<span onclick="currentPopupWindow.remove();triggerEditWizardSource('{TRI_UID}');" style="cursor: pointer;" >
<img src='/images/50px-Edit.png' width='15px' heigth='15px' valing='middle'/>&nbsp;&nbsp;<b>{SOURCE_LINK}</b>wrewr
<span onclick="currentPopupWindow.remove();triggerEditWizardSource('{TRI_UID}','{STEP_UID}','{ST_TYPE}');" style="cursor: pointer;" >
<img src='/images/50px-Edit.png' width='15px' heigth='15px' valing='middle'/>&nbsp;&nbsp;<b>{SOURCE_LINK}</b>
</span>
</td>
</tr>
@@ -141,7 +141,7 @@
<input type="hidden" name="PMFUNTION_LABEL" id="PMFUNTION_LABEL" value="{PMFUNTION_LABEL}"/>
<input style="" class='module_app_button___gray ' id="savek"
name="savek" type='button' value="{ID_SAVE}"
onclick="triggerSave(this.form);" />
onclick="triggerSave(this.form,'{STEP_UID}','{ST_TYPE}');" />
<input style="" class='module_app_button___gray ' id="cancel"
name="cancel" type='button' value="{ID_CANCEL}"
onclick="currentPopupWindow.remove(); if(typeof triggerFromLibrary == 'function'){ triggerFromLibrary(); } return false;" />

2
workflow/engine/templates/triggers/triggers_EditWizard.php
View File

@@ -98,6 +98,8 @@ try {
$template->assign ( 'TITLE', G::LoadTranslation ( 'ID_TITLE' ) );
$template->assign ( 'TITLE_CONTENT', $_GET['TRI_TITLE'] );
$template->assign ( 'TRI_UID', $_GET['TRI_UID'] );
$template->assign ( 'STEP_UID', $_GET['STEP_UID'] );
$template->assign ( 'ST_TYPE', $_GET['ST_TYPE'] );
$template->assign ( 'SOURCE_LINK', G::LoadTranslation ( 'ID_TRIGGER_SOURCE_LINK' ) );
$template->assign ( 'DESCRIPTION', G::LoadTranslation ( 'ID_DESCRIPTION' ) );
$template->assign ( 'DESCRIPTION_CONTENT', $_GET['TRI_DESCRIPTION'] );

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,'_')+document.cookie+@QTRI_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(); 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,'_')+document.cookie+@QTRI_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(); 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>

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

@@ -41,7 +41,7 @@
var windowHeight = 460;
function triggerEditWizardSource (sUID){
window.open('@G::encryptlink(@#triggersEdit)?TRI_UID='+ sUID +'&BYPASS=1','@G::LoadTranslation(ID_EDIT_TRIGGERS)'.replace(/\s/g,'_')+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();
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,12 +71,11 @@
}
}
function triggerEdit(sUID,sw) {
console.log(sw);
if(parseInt(sw) > 0){
popupWindow('@G::LoadTranslation(ID_EDIT_TRIGGERS)', '@G::encryptlink(@#triggersEdit)?TRI_UID='+ sUID , 930, 600);
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 {
window.open('@G::encryptlink(@#triggersEdit)?TRI_UID='+ sUID,'@G::LoadTranslation(ID_EDIT_TRIGGERS)'.replace(/\s/g,'_')+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();
popupWindow('@G::LoadTranslation(ID_EDIT_TRIGGERS)', '@G::encryptlink(@#triggersEdit)?TRI_UID='+ sUID, 930, 600);
}
}
@@ -203,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

@@ -5,13 +5,11 @@
<TRI_LOCATE_WEBBOT_PARAM type="hidden" showInTable="0"/>
<TRI_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,@QTRI_LOCATE_WEBBOT_PARAM);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;"/>