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

Automatic merge with the upstream master branch

Browse Source
This commit is contained in:
Gustavo Cruz
2012-11-29 12:18:58 -04:00
parent f89014c14a 0cc58c934b
commit f55ff5bdae
144 changed files with 6902 additions and 2234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
workflow/engine/xmlform/dbConnections/dbConnections.xml
View File

@@ -29,6 +29,7 @@
<en>Delete</en>
</DBS_DELETE>
<GET_UID type="link" colWidth="40" value="UID" link="#" onclick="msgBox(&#039;UID: &#039;+@QDBS_UID, &#039;info&#039;);return false;"/>
<GET_UID type="link" colWidth="40" value="UID" link="#" onclick="msgBox(&#039;UID: &#039;+@QDBS_UID, &#039;info&#039;);return false;"/>
</dynaForm>

1
workflow/engine/xmlform/dynaforms/fields_Options.xml
View File

@@ -18,6 +18,7 @@
popupWindow('@G::LoadTranslation(ID_EDIT_FIELD)', '@G::encryptlink(@#fields_Edit)?A=@%URL&XMLNODE_NAME='+ uid , 500, 650, null,false,true);
}
function fieldsSave( form ) {
alert("save");
if (pme_validating) {
validatingForm=form;
setTimeout('fieldsSave(validatingForm);',100);

3
workflow/engine/xmlform/dynaforms/fields_Toolbar.xml
View File

@@ -9,6 +9,9 @@
<saveasDyna type="toolButton" class="ss_sprite button_toolbar ss_disk_multiple" onclick="dynaformEditor.save_as()" buttonType="class">
<en>Save as</en>
</saveasDyna>
<importDyna type="toolButton" class="ss_sprite button_toolbar ss_application_side_expand" onclick="dynaformEditor.importForm()" buttonType="class">
<en>Import</en>
</importDyna>
<!--.-->
<separator2 type="toolButton" file="images/dynamicForm/separatorTable.gif" home="public_html" buttonStyle=""/>
<text type="toolButton" class="ss_sprite button_toolbar ss_textfield" onclick="fieldsAdd('text')" buttonType="class">

8
workflow/engine/xmlform/triggers/triggerCopy.xml
View File

@@ -13,10 +13,12 @@
</LBLTITLE1>
<PROCESS_UID type="dropdown" dependentfields="TRIGGER_UID">
<![CDATA[
SELECT PRO.PRO_UID, CON.CON_VALUE
FROM PROCESS AS PRO, CONTENT AS CON
WHERE PRO.PRO_UID = CON.CON_ID AND CON.CON_CATEGORY = 'PRO_TITLE' AND CON.CON_LANG = '@#LANG'
ORDER BY CON.CON_VALUE ASC
]]>
<en>
Process
@@ -25,11 +27,13 @@
</PROCESS_UID>
<TRIGGER_UID type="dropdown" dependentfields="TRI_DESCRIPTION,TRI_WEBBOT">
<![CDATA[
SELECT TGR.TRI_UID, CON.CON_VALUE
FROM TRIGGERS AS TGR, CONTENT AS CON
WHERE TGR.PRO_UID = '@#PROCESS_UID' AND
TGR.TRI_UID = CON.CON_ID AND CON.CON_CATEGORY = 'TRI_TITLE' AND CON.CON_LANG = '@#LANG'
ORDER BY CON.CON_VALUE ASC
]]>
<en>
Trigger
@@ -42,17 +46,21 @@
</TRI_TITLE>
<TRI_DESCRIPTION type="textarea" rows="3" cols="67">
<![CDATA[
SELECT CON.CON_VALUE
FROM CONTENT AS CON
WHERE CON.CON_ID = '@#TRIGGER_UID' AND CON.CON_CATEGORY = 'TRI_DESCRIPTION' AND CON.CON_LANG = '@#LANG'
]]>
<en>Description of the new trigger</en>
</TRI_DESCRIPTION>
<TRI_WEBBOT type="textarea" rows="10" cols="67" readonly="1">
<![CDATA[
SELECT TGR.TRI_WEBBOT
FROM TRIGGERS AS TGR
WHERE TGR.TRI_UID = '@#TRIGGER_UID'
]]>
<en>Script</en>
</TRI_WEBBOT>