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

Merged in paulis/processmaker/MT-12-B (pull request #3945)

Browse Source 
MT-12
This commit is contained in:
Gustavo Cruz
2016-03-24 11:45:30 -04:00
parent 7848816654 a760134fe2
commit 72437c7544
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,11 +33,26 @@ if (isset($_FILES["PROCESS_FILENAME"]["name"]) && (preg_match("/^(?:pm|pmx)$/",
$objectImport = array(); $objectImport = array();
$data = $import->load($_FILES["PROCESS_FILENAME"]["tmp_name"]); $data = $import->load($_FILES["PROCESS_FILENAME"]["tmp_name"]);
if (version_compare($data['version'], '3.0', '>')) { if (version_compare($data['version'], '3.0', '>') && isset($_POST['objectsToImport']) && $_POST['objectsToImport'] === '') {
$objectImport = (isset($data['objects'])) ? explode('|', $data['objects']) : ""; $objectImport = (isset($data['objects'])) ? explode('|', $data['objects']) : "";
$ids = new \ProcessMaker\BusinessModel\Migrator\ExportObjects(); $ids = new \ProcessMaker\BusinessModel\Migrator\ExportObjects();
$objectImport = $ids->getIdObjectList($objectImport); $objectImport = $ids->getIdObjectList($objectImport);
$granularImport = true; $granularImport = true;
$result = array(
"success" => true,
"catchMessage" => '',
"ExistProcessInDatabase" => 0,
"ExistGroupsInDatabase" => 0,
"notExistProcessInDatabase" => 0,
"affectedGroups" => '',
"sNewProUid" => '',
"project_type" => 'bpmn',
"isGranularImport" => $granularImport,
"objectGranularImport" => $objectImport,
"project_type_aux" => ''
);
echo G::json_encode($result);
exit(0);
} }
} }
/*----------------------------------********---------------------------------*/ /*----------------------------------********---------------------------------*/
@@ -145,7 +160,7 @@ if (isset($_FILES["PROCESS_FILENAME"]) &&
$generateUid = false; $generateUid = false;
$prjUid = $importer->import($opt1, $opt2, $generateUid, $objectsToImport); $prjUid = $importer->import($opt1, $opt2, $generateUid, $objectsToImport);
} else { } else {
$prjUid = $importer->import($opt1, $opt2, null, $objectsToImport); $prjUid = $importer->import();
} }
G::LoadClass('Process'); G::LoadClass('Process');
$oProcess = new Process(); $oProcess = new Process();