fernando/luos
1
0
Fork 0
Code Releases Activity

Changes to back to the correct designer when a dynafor was edited

Browse Source
This commit is contained in:
Julio Cesar Laura
2014-02-20 15:32:23 -04:00
parent 4545ecb287
commit 0ffe76c6a8
2 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/methods/dynaforms/dynaforms_Editor.php
View File

@@ -68,6 +68,8 @@ if ($dynaform->exists( $DYN_UID )) {
//creating SESSION for redirecting to new bpmn editor after closing Dynaform //creating SESSION for redirecting to new bpmn editor after closing Dynaform
if (isset( $_GET['bpmn'] ) && $_GET['bpmn'] == '1') { if (isset( $_GET['bpmn'] ) && $_GET['bpmn'] == '1') {
$_SESSION['dynaform_editor'] = 'bpmn'; $_SESSION['dynaform_editor'] = 'bpmn';
} elseif (isset( $_GET['processMap3'] )) {
$_SESSION['dynaform_editor'] = 'processMap3';
} elseif (! isset( $_GET['bpmn'] )) { } elseif (! isset( $_GET['bpmn'] )) {
$_SESSION['dynaform_editor'] = 'processmap'; $_SESSION['dynaform_editor'] = 'processmap';
} }

36
workflow/engine/xmlform/dynaforms/dynaforms_Editor.xml
View File

@@ -1,19 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<dynaForm name="dynaforms_Editor" type="xmlform" width="100%" enableTemplate="1"> <dynaForm name="dynaforms_Editor" type="xmlform" width="100%" enableTemplate="1">
<toolbar type="toolbar" xmlfile="dynaforms/dynaforms_Toolbar"/> <toolbar type="toolbar" xmlfile="dynaforms/dynaforms_Toolbar"/>
<URL type="phpvariable"/> <URL type="phpvariable"/>
<DYN_UID type="phpvariable"/> <DYN_UID type="phpvariable"/>
<PRO_UID type="phpvariable"/> <PRO_UID type="phpvariable"/>
<DYN_EDITOR type="phpvariable"/> <DYN_EDITOR type="phpvariable"/>
<DYNAFORM_NAME type="phpvariable" defaultValue=""/> <DYNAFORM_NAME type="phpvariable" defaultValue=""/>
<title type="title" enableHTML="1"> <title type="title" enableHTML="1">
<en><![CDATA[<table cellpadding="0" cellspacing="0" width="100%" style="background-color:transparent"> <tr> <td class=\'FormTitle\'>Preview</td> <td align="right"></td> </tr> </table>]]></en> <en><![CDATA[<table cellpadding="0" cellspacing="0" width="100%" style="background-color:transparent"> <tr> <td class='FormTitle'>Preview</td> <td align="right"></td> </tr> </table>]]></en>
</title> </title>
<dynaforms_Preview type="private" defaultValue="../dynaforms/dynaforms_Preview"/> <dynaforms_Preview type="private" defaultValue="../dynaforms/dynaforms_Preview"/>
<dynaforms_Ajax type="private" defaultValue="../dynaforms/dynaforms_Ajax"/> <dynaforms_Ajax type="private" defaultValue="../dynaforms/dynaforms_Ajax"/>
<processMap type="private" defaultValue="../processes/processes_Map"/> <processMap type="private" defaultValue="../processes/processes_Map"/>
<processBpmnMap type="private" defaultValue="../bpmn/processmap"/> <processMap3 type="private" defaultValue="../designer"/>
<SCRIPT type="javascript" replaceTags="1"><![CDATA[ <processBpmnMap type="private" defaultValue="../bpmn/processmap"/>
<SCRIPT type="javascript" replaceTags="1"><![CDATA[
function loadEditor() function loadEditor()
{ {
@@ -43,6 +44,11 @@ function loadEditor()
window.location.href="@G::encryptLink(@#processMap)?PRO_UID=@%PRO_UID"; window.location.href="@G::encryptLink(@#processMap)?PRO_UID=@%PRO_UID";
return true; return true;
} }
else if(dynEditorType == 'processMap3')
{
window.location.href="@G::encryptLink(@#processMap3)?pro_uid=@%PRO_UID";
return true;
}
else if(dynEditorType == 'bpmn') else if(dynEditorType == 'bpmn')
{ {
window.location.href="@G::encryptLink(@#processBpmnMap)?PRO_UID=@%PRO_UID"; window.location.href="@G::encryptLink(@#processBpmnMap)?PRO_UID=@%PRO_UID";
@@ -263,4 +269,4 @@ function saveProperties(){
} }
*/ */
]]></SCRIPT> ]]></SCRIPT>
</dynaForm> </dynaForm>