diff --git a/workflow/engine/controllers/designer.php b/workflow/engine/controllers/designer.php
index a861a3bb5..f76fbb5e2 100644
--- a/workflow/engine/controllers/designer.php
+++ b/workflow/engine/controllers/designer.php
@@ -26,7 +26,6 @@ class Designer extends Controller
$proUid = isset($httpData->prj_uid) ? $httpData->prj_uid : '';
$appUid = isset($httpData->app_uid) ? $httpData->app_uid : '';
$proReadOnly = isset($httpData->prj_readonly) ? $httpData->prj_readonly : 'false';
- $stringBpmn = isset($httpData->stringBpmn) ? '' : '';
$client = $this->getClientCredentials();
$authCode = $this->getAuthorizationCode($client);
$debug = false; //System::isDebugMode();
@@ -57,7 +56,6 @@ class Designer extends Controller
$this->setVar('prj_uid', $proUid);
$this->setVar('app_uid', $appUid);
- $this->setVar('stringBpmn', $stringBpmn);
$this->setVar('prj_readonly', $proReadOnly);
$this->setVar('credentials', base64_encode(json_encode($clientToken)));
$this->setVar('isDebugMode', $debug);
diff --git a/workflow/engine/methods/processes/processes_Import_Bpmn.php b/workflow/engine/methods/processes/processes_Import_Bpmn.php
index 6291ba4f4..ede0c3f40 100644
--- a/workflow/engine/methods/processes/processes_Import_Bpmn.php
+++ b/workflow/engine/methods/processes/processes_Import_Bpmn.php
@@ -15,7 +15,6 @@ if (isset($_FILES["PROCESS_FILENAME"]) &&
"PRO_CATEGORY" => "",
"PRO_CREATE_USER" => $_SESSION['USER_LOGGED']
);
- $stringBpmn = base64_encode(file_get_contents($_FILES["PROCESS_FILENAME"]["tmp_name"]));
if ($createMode === "overwrite") {
$process = Process::getByProTitle($data["PRO_TITLE"]);
if ($process !== null) {
@@ -27,11 +26,11 @@ if (isset($_FILES["PROCESS_FILENAME"]) &&
$data["PRO_TITLE"] = Process::getNextTitle($data["PRO_TITLE"]);
}
$project = new \ProcessMaker\Project\Adapter\WorkflowBpmn($data);
+ copy($_FILES["PROCESS_FILENAME"]["tmp_name"], PATH_DOCUMENT . $project->getUid());
$result = array(
"success" => true,
"catchMessage" => "",
"prj_uid" => $project->getUid(),
- "stringBpmn" => $stringBpmn,
"createMode" => $createMode
);
} catch (Exception $e) {
diff --git a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
index 6a5c1a8be..dd7ba7f6f 100755
--- a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
+++ b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
@@ -1094,6 +1094,10 @@ class BpmnWorkflow extends Project\Bpmn
$diagram["participants"] = $bwp->getParticipants($configList);
$project["diagrams"][] = $diagram;
}
+ if (file_exists(PATH_DOCUMENT . $project["prj_uid"])) {
+ $project["prj_bpmn_file_upload"] = file_get_contents(PATH_DOCUMENT . $project["prj_uid"]);
+ unlink(PATH_DOCUMENT . $project["prj_uid"]);
+ }
return $project;
}
diff --git a/workflow/engine/templates/designer/index.html b/workflow/engine/templates/designer/index.html
index aff334230..5b407f802 100644
--- a/workflow/engine/templates/designer/index.html
+++ b/workflow/engine/templates/designer/index.html
@@ -76,8 +76,6 @@
-{$stringBpmn}
-
diff --git a/workflow/engine/templates/processes/main.js b/workflow/engine/templates/processes/main.js
index baab76ea3..9eb6e9208 100755
--- a/workflow/engine/templates/processes/main.js
+++ b/workflow/engine/templates/processes/main.js
@@ -1432,17 +1432,7 @@ importProcessBpmnSubmit = function () {
return;
}
Ext.getCmp('importProcessWindow').close();
- var stringxml = document.createElement("input");
- stringxml.type = "hidden";
- stringxml.name = "stringBpmn";
- stringxml.value = resp_.stringBpmn;
- var form = document.createElement("form");
- document.body.appendChild(form);
- form.appendChild(stringxml);
- form.style.display = "none";
- form.action = "../designer?prj_uid=" + resp_.prj_uid;
- form.method = "POST";
- form.submit();
+ window.location.href = "../designer?prj_uid=" + resp_.prj_uid;
},
failure: function (o, resp) {
Ext.getCmp('importProcessWindow').close();