diff --git a/workflow/engine/methods/bpmn/proxyProcesses_Export.php b/workflow/engine/methods/bpmn/proxyProcesses_Export.php index 39b466591..b0a073ccd 100755 --- a/workflow/engine/methods/bpmn/proxyProcesses_Export.php +++ b/workflow/engine/methods/bpmn/proxyProcesses_Export.php @@ -34,14 +34,9 @@ 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']; if (G::is_https ()) $http = 'https://'; @@ -49,7 +44,6 @@ $Fields['FILENAME_LINKXPDL'] = $xpdlFields['FILENAME_LINKXPDL']; $http = 'http://'; $Fields['FILENAME_LINK'] = $http . $_SERVER['HTTP_HOST'] . '/sys' . SYS_SYS . '/' . SYS_LANG . '/' . SYS_SKIN . '/processes/' . $Fields['FILENAME_LINK']; -$Fields['FILENAME_LINKXPDL'] = $http . $_SERVER['HTTP_HOST'] . '/sys' . SYS_SYS . '/' . SYS_LANG . '/' . SYS_SKIN . '/processes/' . $Fields['FILENAME_LINKXPDL']; $result = G::json_encode( $Fields ); $result = str_replace("\\/","/",'{success:true,data:'.$result.'}'); // unescape the slashes diff --git a/workflow/engine/methods/processes/processes_Export.php b/workflow/engine/methods/processes/processes_Export.php index f886a9271..ead1a8ca5 100755 --- a/workflow/engine/methods/processes/processes_Export.php +++ b/workflow/engine/methods/processes/processes_Export.php @@ -56,14 +56,9 @@ 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']; $pathLength = strlen(PATH_DATA ."sites".PATH_SEP.SYS_SYS.PATH_SEP."files".PATH_SEP."output".PATH_SEP); $length = strlen($Fields['PRO_TITLE']) + $pathLength; @@ -75,9 +70,6 @@ try { if ($key == 'FILENAME') { $Fields[$key] = myTruncate($value, 60, '_', '...pm'); } - if ($key == 'FILENAMEXPDL') { - $Fields[$key] = myTruncate($value, 60, '_', '...xpdl'); - } if (($length) >= 250) { if ($key == 'FILENAME_LINK') { list($file,$rest) = explode ('p=',$value); @@ -85,12 +77,6 @@ try { $Fields[$key] = myTruncate($filenameLink, 250 - $pathLength, '_', ''); $Fields[$key] = $file."p=".$Fields[$key].'&'.$rest; } - if ($key == 'FILENAME_LINKXPDL') { - list($file,$rest) = explode ('p=',$value); - list($filenameLinkXpdl,$rest) = explode ('&',$rest); - $Fields[$key] = myTruncate($filenameLinkXpdl, 250 - $pathLength , '_', ''); - $Fields[$key] = $file."p=".$Fields[$key].'&'.$rest; - } } } @@ -110,13 +96,11 @@ try { "proTitle" => $xmlFrm->fields["PRO_TITLE"]->label, "proDescription" => $xmlFrm->fields["PRO_DESCRIPTION"]->label, "size" => $xmlFrm->fields["SIZE"]->label, - "fileName" => $xmlFrm->fields["FILENAME_LABEL"]->label, - "fileNameXPDL" => $xmlFrm->fields["FILENAME_LABEL1"]->label, + "fileName" => $xmlFrm->fields["FILENAME_LABEL"]->label ); echo G::json_encode($Fields); } - } catch ( Exception $e ){ $G_PUBLISH = new Publisher; diff --git a/workflow/engine/templates/processes/main.js b/workflow/engine/templates/processes/main.js index 6ba0b8969..9b538a8d5 100755 --- a/workflow/engine/templates/processes/main.js +++ b/workflow/engine/templates/processes/main.js @@ -263,19 +263,6 @@ Ext.onReady(function(){ importProcess(); } },{ - text: _('ID_XPDL_IMPORT'), - iconCls: 'silk-add', - icon: '/images/import.gif', - // handler:importXPDLProcess - handler:function(){ - importProcessGlobal.processFileType="xpdl"; - importProcess(); - } - },/*{ - text:'Export', - iconCls: 'silk-add', - icon: '/images/export.png', - },*/{ text: _('ID_BROWSE_LIBRARY'), iconCls: 'button_menu_ext ss_sprite ss_world', //icon: '/images/icon-pmwebservices.png', @@ -658,38 +645,6 @@ deleteProcess = function(){ } } -var winExportProcess = new Ext.Window({ - //layout: "fit", - width: 625, - height: 240, - modal: true, - closeAction: "hide", - resizable: false, - autoScroll: true, - bodyStyle: "padding: 15px 15px 15px 15px;", - - title: "", - - items: [ - new Ext.FormPanel({ - id: "frmExportProcess", - - width: 560, - autoHeight: true, - labelWidth: 1, - - //title: "_", - - items: [ - { - xtype: "displayfield", - fieldLabel: "" - } - ] - }) - ] -}); - function exportProcess() { var record = processesGrid.getSelectionModel().getSelections(); @@ -719,26 +674,9 @@ function exportProcess() { /////// var dataResponse = eval("(" + response.responseText + ")"); //json - - var frm = Ext.ComponentMgr.get("frmExportProcess"); - var frmItems = frm.form.items; - var tdAttribute = " align=\"right\" valign=\"top\" nowrap=\"nowrap\" style=\"color: #515151; font-weight: bold;\""; - var aStyle = "color: #2078A8; text-decoration: none;"; - - var str = "
| " + dataResponse.xmlFrmFieldLabel.proTitle + " | " + dataResponse.PRO_TITLE + " |
| " + dataResponse.xmlFrmFieldLabel.proDescription + " | " + dataResponse.PRO_DESCRIPTION + " |
| " + dataResponse.xmlFrmFieldLabel.size + " | " + dataResponse.SIZE + " |
| " + dataResponse.xmlFrmFieldLabel.fileName + " | " + dataResponse.FILENAME + " |
| " + dataResponse.xmlFrmFieldLabel.fileNameXPDL + " | " + dataResponse.FILENAMEXPDL + " |