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

BUG 12295 "No se pueden guardar las importaciones..." SOLVED

Browse Source 
- No se pueden guardar las importaciones de triggers en un proceso.
- Problema resuelto, se han adicionado validaciones al importar un Triggers. Al seleccionar un Triggers de un proceso en
  la importacion el codigo fuente se muestra y se lo guardar con normalidad.
* Available from version ProcessMaker-2.5.2-testing.1
This commit is contained in:
Luis Fernando Saisa Lopez
2013-07-19 14:22:35 -04:00
parent a9562dfa3e
commit 0115e23f7c
2 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
workflow/engine/xmlform/triggers/triggerCopy.html
View File

@@ -33,6 +33,9 @@
<td class='FormLabel' width="{$form_labelWidth}">{$TRIGGER_UID}</td> <td class='FormLabel' width="{$form_labelWidth}">{$TRIGGER_UID}</td>
<td class='FormFieldContent' width='{$form_fieldContentWidth}' >{$form.TRIGGER_UID}</td> <td class='FormFieldContent' width='{$form_fieldContentWidth}' >{$form.TRIGGER_UID}</td>
</tr> </tr>
<div style="display: none;">{$form.TRIGGER_UID_AUX}</div>
<tr> <tr>
<td class='FormLabel' width="{$form_labelWidth}"><font color="red">* </font>{$TRI_TITLE}</td> <td class='FormLabel' width="{$form_labelWidth}"><font color="red">* </font>{$TRI_TITLE}</td>
<td class='FormFieldContent' width='{$form_fieldContentWidth}' >{$form.TRI_TITLE}</td> <td class='FormFieldContent' width='{$form_fieldContentWidth}' >{$form.TRI_TITLE}</td>

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

@@ -26,7 +26,7 @@
</en> </en>
</PROCESS_UID> </PROCESS_UID>
<TRIGGER_UID type="dropdown" dependentfields="TRI_DESCRIPTION,TRI_WEBBOT" > <TRIGGER_UID type="dropdown" dependentfields="TRI_WEBBOT,TRI_DESCRIPTION,TRIGGER_UID_AUX" >
<![CDATA[ <![CDATA[
SELECT TGR.TRI_UID, CON.CON_VALUE SELECT TGR.TRI_UID, CON.CON_VALUE
FROM TRIGGERS AS TGR, CONTENT AS CON FROM TRIGGERS AS TGR, CONTENT AS CON
@@ -41,6 +41,15 @@
</en> </en>
</TRIGGER_UID> </TRIGGER_UID>
<TRIGGER_UID_AUX type="text" maxlength="64" validate="Any" size="15" mode="edit">
<![CDATA[
SELECT TGR.TRI_UID
FROM TRIGGERS AS TGR
WHERE TGR.TRI_UID = '@#TRIGGER_UID'
]]>
<en></en>
</TRIGGER_UID_AUX>
<TRI_TITLE type="text" size="70" maxlength="100" required="1" > <TRI_TITLE type="text" size="70" maxlength="100" required="1" >
<en>Title of the new trigger</en> <en>Title of the new trigger</en>
</TRI_TITLE> </TRI_TITLE>
@@ -55,7 +64,7 @@
<en>Description of the new trigger</en> <en>Description of the new trigger</en>
</TRI_DESCRIPTION> </TRI_DESCRIPTION>
<TRI_WEBBOT type="textarea" rows="10" cols="67" readonly="1" onChange="alert('des:'+document.getElementById('form[TRI_WEBBOT]').value); triggerEditor.setCode(document.getElementById('form[TRI_WEBBOT]').value);"> <TRI_WEBBOT type="textarea" rows="10" cols="67" readonly="1">
<![CDATA[ <![CDATA[
SELECT TGR.TRI_WEBBOT SELECT TGR.TRI_WEBBOT
FROM TRIGGERS AS TGR FROM TRIGGERS AS TGR
@@ -100,8 +109,21 @@
currentPopupWindow.remove(); currentPopupWindow.remove();
} }
function triggerCheckWebbotTimer()
{
var triUid = getField("TRIGGER_UID_AUX").value;
if (triUid != triUidPrev) {
triggerEditor.setValue(document.getElementById("form[TRI_WEBBOT]").value);
triUidPrev = triUid;
} else {
setTimeout("triggerCheckWebbotTimer()", 100);
}
}
var cboTriggerUid = getField("TRIGGER_UID"); var cboTriggerUid = getField("TRIGGER_UID");
var txtTgrTitle = getField("TRI_TITLE"); var txtTgrTitle = getField("TRI_TITLE");
var triUidPrev = "";
leimnud.event.add( leimnud.event.add(
getField("PROCESS_UID"), getField("PROCESS_UID"),
@@ -109,6 +131,8 @@
function () function ()
{ {
txtTgrTitle.value = ""; txtTgrTitle.value = "";
triggerEditor.setValue("");
triUidPrev= "";
} }
); );
@@ -117,14 +141,13 @@
"change", "change",
function () function ()
{ {
txtTgrTitle.value = "";
if (cboTriggerUid.value != "") { if (cboTriggerUid.value != "") {
txtTgrTitle.value = cboTriggerUid.options[cboTriggerUid.selectedIndex].text; txtTgrTitle.value = cboTriggerUid.options[cboTriggerUid.selectedIndex].text;
} setTimeout("triggerCheckWebbotTimer()", 100);
if (triggerEditor) { } else {
triggerEditor.setValue(document.getElementById('form[TRI_WEBBOT]').value); txtTgrTitle.value = "";
//triggerEditor.setCode(document.getElementById('form[TRI_WEBBOT]').value); triggerEditor.setValue("");
triUidPrev= "";
} }
} }
); );