fernando/luos
1
0
Fork 0
Code Releases Activity

MT-28 manejo de respuestas ajax... para la visulaizacion del listObject

Browse Source
This commit is contained in:
dheeyi
2016-03-23 13:28:28 -04:00
parent d3a211a627
commit 62851d499e
4 changed files with 68 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
workflow/engine/src/ProcessMaker/BusinessModel/Migrator/ExportObjects.php
View File

@@ -63,5 +63,28 @@ class ExportObjects
throw $e;
}
}
/**
* @param $objects
* @return array
* @throws \Exception
*/
public function getIdObjectList($objects)
{
try {
$idObjectList = array();
foreach ($this->objectsList as $key => $val) {
$key++;
foreach ($objects as $row) {
if(strtoupper(str_replace(' ', '', $this->objectsList[$key - 1])) === $row){
array_push($idObjectList, $key);
}
}
}
return $idObjectList;
} catch (\Exception $e) {
throw $e;
}
}
}

28
workflow/engine/src/ProcessMaker/Importer/Importer.php
View File

@@ -77,7 +77,7 @@ abstract class Importer
}
}
public function import($option = self::IMPORT_OPTION_CREATE_NEW, $optionGroup = self::GROUP_IMPORT_OPTION_CREATE_NEW, $generateUidFromJs = null, $granularImporter = 'NO', $granularOptions = '')
public function import($option = self::IMPORT_OPTION_CREATE_NEW, $optionGroup = self::GROUP_IMPORT_OPTION_CREATE_NEW, $generateUidFromJs = null, $objectsToImport = '')
{
$this->prepare();
@@ -170,10 +170,10 @@ abstract class Importer
break;
case self::IMPORT_OPTION_OVERWRITE:
//Shouldn't generate new UID for all objects
if($granularImporter === 'NO'){
if($objectsToImport === ''){
$this->removeProject();
} else {
if(in_array('PROCESSDEFINITION', $granularOptions)){
if(in_array('PROCESSDEFINITION', $objectsToImport)){
$this->removeProject();
}
}
@@ -213,20 +213,14 @@ abstract class Importer
}
//Granular Import
switch ($granularImporter) {
case '':
throw new \Exception(\G::LoadTranslation("ID_GRANULAR"),self::IMPORTED_PROJECT_DOES_NOT_EXISTS);
break;
case 'YES':
if($granularOptions === 'YES'){
$granularObj = new \ProcessMaker\BusinessModel\Migrator\GranularImporter();
$objectList = $granularObj->loadObjectsListSelected($this->importData, $granularOptions);
if(sizeof($objectList)>0){
$granularObj->import($objectList);
}
return $this->importData['tables']['bpmn']["project"][0]["prj_uid"];
}
break;
//$granularOptions merge
if($objectsToImport){
$granularObj = new \ProcessMaker\BusinessModel\Migrator\GranularImporter();
$objectList = $granularObj->loadObjectsListSelected($this->importData, $objectsToImport);
if(sizeof($objectList)>0){
$granularObj->import($objectList);
}
return $this->importData['tables']['bpmn']["project"][0]["prj_uid"];
}
$result = $this->doImport($generateUid);

6
workflow/engine/src/ProcessMaker/Importer/XmlImporter.php
View File

@@ -131,13 +131,13 @@ class XmlImporter extends Importer
}
}
//Get the ProcessObject
$this->objects = (isset($this->metadata['processObject'])) ? $this->metadata['processObject'] : '';
$this->objects = (isset($this->metadata['export_objects'])) ? $this->metadata['export_objects'] : '';
return array(
"tables" => $tables,
"files" => array("workflow" => $wfFiles, "bpmn" => array()),
"version" => $this->version,
"objects" => $this->objects
"version" => $this->getVersion(),
"objects" => $this->getObjects()
);
}