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

Merged in bugfix/PMC-1399 (pull request #7189)

Browse Source 
PMC-1399

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Andrea Adamczyk
2019-12-17 19:33:55 +00:00
committed by Julio Cesar Laura Avendaño
parent 6dcf2e44ed 8872026257
commit 21b2eddc89
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/methods/processes/processes_Import_Ajax.php
View File

@@ -291,7 +291,8 @@ if (isset($_POST["PRO_FILENAME"]) &&
exit(0); exit(0);
} }
if (version_compare($data['version'], '3.0', '>') && $_POST['IMPORT_OPTION']==="3") { if ((version_compare($data['version'], '3.0',
'>') && $_POST['IMPORT_OPTION'] === "3") || empty($_POST['objectsToImport'])) {
$objectsToImport = []; $objectsToImport = [];
$objects = (isset($data['objects'])) ? explode('|', $data['objects']) : ""; $objects = (isset($data['objects'])) ? explode('|', $data['objects']) : "";
$ids = new \ProcessMaker\BusinessModel\Migrator\ExportObjects(); $ids = new \ProcessMaker\BusinessModel\Migrator\ExportObjects();
@@ -304,6 +305,7 @@ if (isset($_POST["PRO_FILENAME"]) &&
if (isset($_POST['objectsToImport']) && !empty(G::json_decode($_POST['objectsToImport']))) { if (isset($_POST['objectsToImport']) && !empty(G::json_decode($_POST['objectsToImport']))) {
$objectsToImport = G::json_decode($_POST['objectsToImport']); $objectsToImport = G::json_decode($_POST['objectsToImport']);
} }
/*----------------------------------********---------------------------------*/ /*----------------------------------********---------------------------------*/
$prjUid = $importer->import($option, $optionGroup, false, $objectsToImport); $prjUid = $importer->import($option, $optionGroup, false, $objectsToImport);