diff --git a/workflow/engine/methods/processes/processes_Export.php b/workflow/engine/methods/processes/processes_Export.php index 0963fce43..7bb7bfae0 100644 --- a/workflow/engine/methods/processes/processes_Export.php +++ b/workflow/engine/methods/processes/processes_Export.php @@ -36,9 +36,14 @@ try { /* Includes */ G::LoadClass('processes'); +G::LoadClass('xpdl'); $oProcess = new Processes(); +$oXpdl = new Xpdl(); $proFields = $oProcess->serializeProcess( $sProUid ); $Fields = $oProcess->saveSerializedProcess ( $proFields ); +$xpdlFields = $oXpdl->xmdlProcess($sProUid); +$Fields['FILENAMEXPDL'] = $xpdlFields['FILENAMEXPDL']; +$Fields['FILENAME_LINKXPDL'] = $xpdlFields['FILENAME_LINKXPDL']; /* Render page */ $G_PUBLISH = new Publisher; diff --git a/workflow/engine/methods/processes/processes_ImportExistingXpdl.php b/workflow/engine/methods/processes/processes_ImportExistingXpdl.php index 220d65846..292bf4666 100644 --- a/workflow/engine/methods/processes/processes_ImportExistingXpdl.php +++ b/workflow/engine/methods/processes/processes_ImportExistingXpdl.php @@ -81,7 +81,7 @@ $G_ID_MENU_SELECTED = 'PROCESSES'; $G_PUBLISH = new Publisher; $G_PUBLISH->AddContent('xmlform', 'xmlform', 'processes/processes_ValidatingGroups', '', $Fields, 'processes_ImportExisting' ); - G::RenderPage('publish'); + G::RenderPage('publish', "blank"); die; } //end added code @@ -127,5 +127,5 @@ catch ( Exception $e ){ $G_PUBLISH = new Publisher; $aMessage['MESSAGE'] = $e->getMessage(); $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/showMessage', '', $aMessage ); - G::RenderPage('publish'); + G::RenderPage('publish', "blank"); } diff --git a/workflow/engine/methods/processes/processes_ImportFileXpdl.php b/workflow/engine/methods/processes/processes_ImportFileXpdl.php index 864158e29..43e5e525d 100644 --- a/workflow/engine/methods/processes/processes_ImportFileXpdl.php +++ b/workflow/engine/methods/processes/processes_ImportFileXpdl.php @@ -53,7 +53,7 @@ $G_ID_MENU_SELECTED = 'PROCESSES'; $G_PUBLISH = new Publisher; $G_PUBLISH->AddContent('xmlform', 'xmlform', 'processes/processes_ImportExistingXpdl', '', $Fields, 'processes_ImportExistingXpdl' ); - G::RenderPage('publish'); + G::RenderPage('publish', "blank"); die; } // code added by gustavo cruz gustavo-at-colosa-dot-com @@ -88,7 +88,7 @@ $G_ID_MENU_SELECTED = 'PROCESSES'; $G_PUBLISH = new Publisher; $G_PUBLISH->AddContent('xmlform', 'xmlform', 'processes/processes_ValidatingGroups', '', $Fields, 'processes_ImportFile' ); - G::RenderPage('publish'); + G::RenderPage('publish', "blank"); die; } // end added code @@ -101,5 +101,5 @@ catch ( Exception $e ){ $G_PUBLISH = new Publisher; $aMessage['MESSAGE'] = $e->getMessage(); $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/showMessage', '', $aMessage ); - G::RenderPage('publish'); + G::RenderPage('publish', "blank"); } diff --git a/workflow/engine/methods/processes/processes_ImportXpdl.php b/workflow/engine/methods/processes/processes_ImportXpdl.php index be026b73b..a0eb2b9d4 100644 --- a/workflow/engine/methods/processes/processes_ImportXpdl.php +++ b/workflow/engine/methods/processes/processes_ImportXpdl.php @@ -54,12 +54,12 @@ G::LoadClass('processes'); $G_ID_MENU_SELECTED = 'PROCESSES'; $G_PUBLISH = new Publisher; $G_PUBLISH->AddContent('xmlform', 'xmlform', 'processes/processes_ImportXpdl', '', NULL, 'processes_ImportFileXpdl' ); - G::RenderPage( "publish" ); + G::RenderPage('publish', "blank"); } catch ( Exception $e ){ $G_PUBLISH = new Publisher; $aMessage['MESSAGE'] = $e->getMessage(); $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/showMessage', '', $aMessage ); - G::RenderPage('publish'); + G::RenderPage('publish', "blank"); } diff --git a/workflow/engine/templates/processes/main.js b/workflow/engine/templates/processes/main.js index 3dc097798..535b3f8f3 100755 --- a/workflow/engine/templates/processes/main.js +++ b/workflow/engine/templates/processes/main.js @@ -200,6 +200,11 @@ Ext.onReady(function(){ iconCls: 'silk-add', icon: '/images/import.gif', handler:importProcess + },{ + text:'Import XPDL', + iconCls: 'silk-add', + icon: '/images/import.gif', + handler:importXPDLProcess },/*{ text:'Export', iconCls: 'silk-add', @@ -446,6 +451,10 @@ importProcess = function(){ window.location = 'processes_Import'; } +importXPDLProcess = function(){ + window.location = 'processes_ImportXpdl'; +} + browseLibrary = function(){ window.location = 'processes_Library'; }