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

mutiples validaciones

Browse Source
This commit is contained in:
Roly Rudy Gutierrez Pinto
2013-11-27 12:59:32 -04:00
parent be9219880e
commit 645d43cb82
6 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2165,6 +2165,7 @@ class processMap
$oCriteria = new Criteria('workflow'); $oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(TriggersPeer::TRI_UID); $oCriteria->addSelectColumn(TriggersPeer::TRI_UID);
$oCriteria->addSelectColumn(TriggersPeer::PRO_UID); $oCriteria->addSelectColumn(TriggersPeer::PRO_UID);
$oCriteria->addAsColumn('TRI_LOCATE_WEBBOT_PARAM', 'LOCATE(' . TriggersPeer::TRI_WEBBOT . ',' . TriggersPeer::TRI_PARAM . ')');
$oCriteria->addAsColumn('TRI_TITLE', 'C1.CON_VALUE'); $oCriteria->addAsColumn('TRI_TITLE', 'C1.CON_VALUE');
$oCriteria->addAsColumn('TRI_DESCRIPTION', 'C2.CON_VALUE'); $oCriteria->addAsColumn('TRI_DESCRIPTION', 'C2.CON_VALUE');
$oCriteria->addAlias('C1', 'CONTENT'); $oCriteria->addAlias('C1', 'CONTENT');

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

@@ -35,7 +35,7 @@
<tr> <tr>
<td nowrap valign="top"> <td nowrap valign="top">
<span onclick="currentPopupWindow.remove();triggerEditWizardSource('{TRI_UID}');" style="cursor: pointer;" > <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> <img src='/images/50px-Edit.png' width='15px' heigth='15px' valing='middle'/>&nbsp;&nbsp;<b>{SOURCE_LINK}</b>wrewr
</span> </span>
</td> </td>
</tr> </tr>

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

@@ -13,7 +13,7 @@
<triggersEdit type="hidden" defaultValue="../triggers/triggers_Edit"/> <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=950,height=570,top='+((screen.height-570)/2)+',left='+((screen.width-950)/2)); return false;"/> <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;"/>
<CONDITION type="link" colWidth="" value="@G::LoadTranslation(ID_CONDITION)" link="#" onclick="editTriggerCondition(@QSTEP_UID, @QTRI_UID, &#039;AFTER&#039;);return false;"/> <CONDITION type="link" colWidth="" value="@G::LoadTranslation(ID_CONDITION)" link="#" onclick="editTriggerCondition(@QSTEP_UID, @QTRI_UID, &#039;AFTER&#039;);return false;"/>

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

@@ -13,7 +13,7 @@
<triggersEdit type="hidden" defaultValue="../triggers/triggers_Edit"/> <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=950,height=570,top='+((screen.height-570)/2)+',left='+((screen.width-950)/2)); return false;"/> <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;"/>
<CONDITION type="link" colWidth="" value="@G::LoadTranslation(ID_CONDITION)" link="#" onclick="editTriggerCondition(@QSTEP_UID, @QTRI_UID, &#039;BEFORE&#039;);return false;"/> <CONDITION type="link" colWidth="" value="@G::LoadTranslation(ID_CONDITION)" link="#" onclick="editTriggerCondition(@QSTEP_UID, @QTRI_UID, &#039;BEFORE&#039;);return false;"/>

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

@@ -41,7 +41,7 @@
var windowHeight = 460; var windowHeight = 460;
function triggerEditWizardSource (sUID){ 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,'_')+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() { function triggerNew() {
@@ -71,9 +71,13 @@
} }
} }
function triggerEdit(sUID) { function triggerEdit(sUID,sw) {
var win = window.open('@G::encryptlink(@#triggersEdit)?TRI_UID='+ sUID,'@G::LoadTranslation(ID_EDIT_TRIGGERS)'.replace(/\s/g,'_')+document.cookie,'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)); console.log(sw);
win.focus(); if(parseInt(sw) > 0){
popupWindow('@G::LoadTranslation(ID_EDIT_TRIGGERS)', '@G::encryptlink(@#triggersEdit)?TRI_UID='+ sUID , 930, 600);
} 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();
}
} }
function triggerProperties( sUID ) { function triggerProperties( sUID ) {

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

@@ -3,11 +3,15 @@
<TRI_UID type="hidden" showInTable="0"/> <TRI_UID type="hidden" showInTable="0"/>
<TRI_LOCATE_WEBBOT_PARAM type="hidden" showInTable="0"/>
<TRI_PARAM type="hidden" showInTable="0"/>
<TRI_TITLE type="text" colWidth="350" titleAlign="left" align="left"> <TRI_TITLE type="text" colWidth="350" titleAlign="left" align="left">
<en>Title</en> <en>Title</en>
</TRI_TITLE> </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;"/> <PROPERTIES type="link" colWidth="40" value="@G::LoadTranslation(ID_PROPERTIES)" link="#" onclick="triggerProperties(@QTRI_UID);return false;"/>