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

MT-28

Browse Source
This commit is contained in:
dheeyi
2016-03-23 16:37:05 -04:00
parent 7ad8e6b1fc
commit 1e81b13536
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,7 +27,7 @@ use \ProcessMaker\Importer\XmlImporter;
ini_set("max_execution_time", 0); ini_set("max_execution_time", 0);
$affectedGroups = array(); $affectedGroups = array();
if (preg_match("/^(?:pm|pmx)$/", pathinfo($_FILES["PROCESS_FILENAME"]["name"], PATHINFO_EXTENSION))) { if (isset($_FILES["PROCESS_FILENAME"]["name"]) && (preg_match("/^(?:pm|pmx)$/", pathinfo($_FILES["PROCESS_FILENAME"]["name"], PATHINFO_EXTENSION)))) {
$import = new XmlImporter(); $import = new XmlImporter();
$granularImport = false; $granularImport = false;
$objectImport = array(); $objectImport = array();
@@ -138,10 +138,10 @@ if (isset($_FILES["PROCESS_FILENAME"]) &&
$objectsToImport = G::json_decode($_POST['objectsToImport']); $objectsToImport = G::json_decode($_POST['objectsToImport']);
if ($_POST['generateUid'] === 'generate') { if ($_POST['generateUid'] === 'generate') {
$generateUid = true; $generateUid = true;
$prjUid = $importer->import($opt1, $opt2, $generateUid); $prjUid = $importer->import($opt1, $opt2, $generateUid, $objectsToImport);
} elseif ($_POST['generateUid'] === 'keep') { } elseif ($_POST['generateUid'] === 'keep') {
$generateUid = false; $generateUid = false;
$prjUid = $importer->import($opt1, $opt2, $generateUid); $prjUid = $importer->import($opt1, $opt2, $generateUid, $objectsToImport);
} else { } else {
$prjUid = $importer->import($opt1, $opt2, null, $objectsToImport); $prjUid = $importer->import($opt1, $opt2, null, $objectsToImport);
} }

5
workflow/engine/src/ProcessMaker/BusinessModel/Migrator/GranularImporter.php
View File

@@ -20,7 +20,10 @@ class GranularImporter
} }
/** /**
* Load Objects List Selected * @param $data
* @param $aGranular
* @return array
* @throws \Exception
*/ */
public function loadObjectsListSelected($data, $aGranular) public function loadObjectsListSelected($data, $aGranular)
{ {