fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in zeitmaster/processmaker/HOR-1907 (pull request #4947)

Browse Source 
HOR-1907
This commit is contained in:
Julio Cesar Laura Avendaño
2016-09-23 13:49:07 -04:00
parent c989d6422e fa3e585164
commit 4fdc1608c9
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -135,8 +135,19 @@ class GranularImporter
$data['tables']['workflow']['reportTablesFields'] : []; $data['tables']['workflow']['reportTablesFields'] : [];
break; break;
default: default:
$objectList[$nameObject] = isset($data['tables']['plugins'][strtolower($nameObject)]) ? $prjUID = isset($data['tables']['workflow']['process']['PRO_UID'])
$data['tables']['plugins'][strtolower($nameObject)] : ''; ?$data['tables']['workflow']['process']['PRO_UID']
:$data['tables']['workflow']['process'][0]['PRO_UID'];
$objectList[$nameObject] = [];
$objectList[$nameObject]['metadata'] = [
'PRJ_UID' => $prjUID
];
foreach ($data['tables']['plugins'] as $pluginKey => $pluginTable) {
$key = explode(".", $pluginKey);
if ($key[0]===strtolower($nameObject)) {
$objectList[$nameObject][$key[1]] = $pluginTable;
}
}
break; break;
} }
return $objectList; return $objectList;

8
workflow/engine/src/ProcessMaker/BusinessModel/Migrator/PluginMigratorAdapter.php
View File

@@ -34,7 +34,13 @@ class PluginMigratorAdapter implements Exportable, Importable
public function export($prj_uid) public function export($prj_uid)
{ {
return $this->migrator->export($prj_uid); $data = $this->migrator->export($prj_uid);
foreach ($data['plugin-data'] as $key => $plugin) {
$newKey = str_replace("MIGRATOR", "", strtoupper(get_class($this->migrator))).'.'.$key;
$data['plugin-data'][$newKey] = $plugin;
unset($data['plugin-data'][$key]);
}
return $data;
} }
public function afterExport() public function afterExport()