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 #3899)

Browse Source 
MT-12
This commit is contained in:
Gustavo Cruz
2016-03-22 15:26:46 -04:00
parent 9a87be404d 02c0ffb8b0
commit 0cb98a9fc9
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,8 +62,8 @@ if (PMLicensedFeatures::getSingleton()->verifyfeature("B0oWlBLY3hHdWY0YUNpZEtFQm
$projectTitle = $data["tables"]["bpmn"]["project"][0]["prj_name"]; $projectTitle = $data["tables"]["bpmn"]["project"][0]["prj_name"];
} }
if(isset($data['objects'])){ if(isset($data['objects'])){
$export = new \ProcessMaker\BusinessModel\Migrator\ExportObjects(); $objectImport = $data['objects'];
$objectImport = $export->objectList($data['objects']); $granularImport = 'YES';
} }
break; break;
} }
@@ -148,7 +148,8 @@ if (isset($_FILES["PROCESS_FILENAME"]) &&
"affectedGroups" => '', "affectedGroups" => '',
"sNewProUid" => $prjUid, "sNewProUid" => $prjUid,
"project_type" => 'bpmn', "project_type" => 'bpmn',
"ImportGranularOptions" => '', "isGranularImport" => '',
"objectGranularImport" => '',
"project_type_aux" => $proType "project_type_aux" => $proType
); );
} catch (Exception $e) { } catch (Exception $e) {
@@ -175,7 +176,8 @@ if (isset($_FILES["PROCESS_FILENAME"]) &&
"affectedGroups" => !empty($affectedGroups)? $affectedGroups : '', "affectedGroups" => !empty($affectedGroups)? $affectedGroups : '',
"sNewProUid" => '', "sNewProUid" => '',
"project_type" => 'bpmn', "project_type" => 'bpmn',
"ImportGranularOptions" => $objectImport, "isGranularImport" => $granularImport,
"objectGranularImport" => $objectImport,
"proFileName" => $_FILES["PROCESS_FILENAME"]["name"], "proFileName" => $_FILES["PROCESS_FILENAME"]["name"],
"groupBeforeAccion" => 'uploadFileNewProcess', "groupBeforeAccion" => 'uploadFileNewProcess',
"importOption" => 0 "importOption" => 0
@@ -249,7 +251,8 @@ if (isset($_POST["PRO_FILENAME"]) &&
"ExistGroupsInDatabase" => '', "ExistGroupsInDatabase" => '',
"sNewProUid" => $prjUid, "sNewProUid" => $prjUid,
"project_type" => 'bpmn', "project_type" => 'bpmn',
"ImportGranularOptions" => '', "isGranularImport" => '',
"objectGranularImport" => '',
"project_type_aux" => $proType "project_type_aux" => $proType
); );
} catch (Exception $e) { } catch (Exception $e) {
@@ -271,7 +274,8 @@ if (isset($_POST["PRO_FILENAME"]) &&
"affectedGroups" => !empty($affectedGroups)? $affectedGroups : '', "affectedGroups" => !empty($affectedGroups)? $affectedGroups : '',
"sNewProUid" => '', "sNewProUid" => '',
"project_type" => 'bpmn', "project_type" => 'bpmn',
"ImportGranularOptions" => $objectImport, "isGranularImport" => '',
"objectGranularImport" => $objectImport,
"proFileName" => $_POST["PRO_FILENAME"], "proFileName" => $_POST["PRO_FILENAME"],
"groupBeforeAccion" => "uploadFileNewProcess", "groupBeforeAccion" => "uploadFileNewProcess",
"importOption" => (isset($_POST["IMPORT_OPTION"]))? (int)($_POST["IMPORT_OPTION"]) : 0 "importOption" => (isset($_POST["IMPORT_OPTION"]))? (int)($_POST["IMPORT_OPTION"]) : 0