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

HOR-2786

Browse Source 
Fixed observations od CR
This commit is contained in:
davidcallizaya
2017-03-01 15:03:18 -04:00
parent 2a6d59bca4
commit d8f3e70280
1 changed files with 49 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
workflow/engine/classes/class.processes.php
View File

@@ -5599,71 +5599,74 @@ class Processes
} }
/** /**
* *
* @param type $oData * @param type $oData
*/ */
public function loadIdsFromData($oData) public function loadIdsFromData($oData)
{ {
$this->loadIdsFor(Process::class, ProcessPeer::PRO_UID, ProcessPeer::PRO_ID, $oData['process']); $this->loadIdsFor(Process::class, ProcessPeer::PRO_UID, ProcessPeer::PRO_ID, $oData['process']);
$this->loadIdsFor(Task::class, TaskPeer::TAS_UID, TaskPeer::TAS_ID, $oData['tasks']); $this->loadIdsFor(Task::class, TaskPeer::TAS_UID, TaskPeer::TAS_ID, $oData['tasks']);
//The following code matches the Models and the correspondent Property /**
// in the imported data object, so it could be used to change the UID * @todo The following code matches the Models and the correspondent Property
// fields by ID on the other tables. * in the imported data object, so it could be used to change the UID
//$this->loadIdsFor(ProcessCategory::class, ProcessCategoryPeer::CATEGORY_UID, ?, $oData->processCategory); * fields by ID on the other tables.
//$this->loadIdsFor(SwimlanesElements::class, ?, ?, $oData->lanes); * $this->loadIdsFor(ProcessCategory::class, ProcessCategoryPeer::CATEGORY_UID, ?, $oData->processCategory);
//$this->loadIdsFor(Gateway::class, GatewayPeer::GAT_UID, ?, $oData->gateways); * $this->loadIdsFor(SwimlanesElements::class, ?, ?, $oData->lanes);
//$this->loadIdsFor(Dynaform::class, $oData->dynaforms); * $this->loadIdsFor(Gateway::class, GatewayPeer::GAT_UID, ?, $oData->gateways);
//$this->loadIdsFor(InputDocument::class, $oData->inputs); * $this->loadIdsFor(Dynaform::class, $oData->dynaforms);
//$this->loadIdsFor(OutputDocument::class, $oData->outputs); * $this->loadIdsFor(InputDocument::class, $oData->inputs);
//$this->loadIdsFor(Step::class, $oData->steps); * $this->loadIdsFor(OutputDocument::class, $oData->outputs);
//$this->loadIdsFor(StepSupervisor::class, $oData->stepSupervisor); * $this->loadIdsFor(Step::class, $oData->steps);
//$this->loadIdsFor(Triggers::class, $oData->triggers); * $this->loadIdsFor(StepSupervisor::class, $oData->stepSupervisor);
//$this->loadIdsFor(StepTrigger::class, $oData->steptriggers); * $this->loadIdsFor(Triggers::class, $oData->triggers);
//$this->loadIdsFor(TaskUser::class, ?, ?, $oData->taskusers); * $this->loadIdsFor(StepTrigger::class, $oData->steptriggers);
//$this->loadIdsFor(Groupwf::class, $oData->groupwfs); * $this->loadIdsFor(TaskUser::class, ?, ?, $oData->taskusers);
//$this->loadIdsFor(DbSource::class, $oData->dbconnections); * $this->loadIdsFor(Groupwf::class, $oData->groupwfs);
//$this->loadIdsFor(ReportTables::class, $oData->reportTablesVars); * $this->loadIdsFor(DbSource::class, $oData->dbconnections);
//$this->loadIdsFor(SubProcess::class, $oData->subProcess); * $this->loadIdsFor(ReportTables::class, $oData->reportTablesVars);
//$this->loadIdsFor(CaseTracker::class, $oData->caseTracker); * $this->loadIdsFor(SubProcess::class, $oData->subProcess);
//$this->loadIdsFor(CaseTrackerObject::class, $oData->caseTrackerObject); * $this->loadIdsFor(CaseTracker::class, $oData->caseTracker);
//$this->loadIdsFor(ObjectPermission::class, $oData->objectPermissions); * $this->loadIdsFor(CaseTrackerObject::class, $oData->caseTrackerObject);
//$this->loadIdsFor(Stage::class, $oData->stage); * $this->loadIdsFor(ObjectPermission::class, $oData->objectPermissions);
//$this->loadIdsFor(FieldCondition::class, $oData->fieldCondition); * $this->loadIdsFor(Stage::class, $oData->stage);
//$this->loadIdsFor(Event::class, $oData->event); * $this->loadIdsFor(FieldCondition::class, $oData->fieldCondition);
//$this->loadIdsFor(CaseScheduler::class, $oData->caseScheduler); * $this->loadIdsFor(Event::class, $oData->event);
//$this->loadIdsFor(Configuration::class, $oData->taskExtraProperties); * $this->loadIdsFor(CaseScheduler::class, $oData->caseScheduler);
//$this->loadIdsFor(ProcessUser::class, $oData->processUser); * $this->loadIdsFor(Configuration::class, $oData->taskExtraProperties);
//$this->loadIdsFor(ProcessVariables::class, $oData->processVariables); * $this->loadIdsFor(ProcessUser::class, $oData->processUser);
//$this->loadIdsFor(\ProcessMaker\BusinessModel\WebEntry::class, $arrayProcessData["PRO_UID"], $arrayProcessData["PRO_CREATE_USER"], $oData->webEntry); * $this->loadIdsFor(ProcessVariables::class, $oData->processVariables);
//$this->loadIdsFor(\ProcessMaker\BusinessModel\WebEntryEvent::class, $arrayProcessData["PRO_UID"], $arrayProcessData["PRO_CREATE_USER"], $oData->webEntryEvent); * $this->loadIdsFor(\ProcessMaker\BusinessModel\WebEntry::class, $arrayProcessData["PRO_UID"], $arrayProcessData["PRO_CREATE_USER"], $oData->webEntry);
//$this->loadIdsFor(\ProcessMaker\BusinessModel\MessageType::class, $oData->messageType); * $this->loadIdsFor(\ProcessMaker\BusinessModel\WebEntryEvent::class, $arrayProcessData["PRO_UID"], $arrayProcessData["PRO_CREATE_USER"], $oData->webEntryEvent);
//$this->loadIdsFor(\ProcessMaker\BusinessModel\MessageType\Variable::class, $oData->messageTypeVariable); * $this->loadIdsFor(\ProcessMaker\BusinessModel\MessageType::class, $oData->messageType);
//$this->loadIdsFor(\ProcessMaker\BusinessModel\MessageEventDefinition::class, $arrayProcessData["PRO_UID"], $oData->messageEventDefinition); * $this->loadIdsFor(\ProcessMaker\BusinessModel\MessageType\Variable::class, $oData->messageTypeVariable);
//$this->loadIdsFor(\ProcessMaker\BusinessModel\ScriptTask::class, $arrayProcessData["PRO_UID"], $oData->scriptTask); * $this->loadIdsFor(\ProcessMaker\BusinessModel\MessageEventDefinition::class, $arrayProcessData["PRO_UID"], $oData->messageEventDefinition);
//$this->loadIdsFor(\ProcessMaker\BusinessModel\TimerEvent::class, $arrayProcessData["PRO_UID"], $oData->timerEvent); * $this->loadIdsFor(\ProcessMaker\BusinessModel\ScriptTask::class, $arrayProcessData["PRO_UID"], $oData->scriptTask);
//$this->loadIdsFor(\ProcessMaker\BusinessModel\EmailEvent::class, $arrayProcessData["PRO_UID"], $oData->emailEvent); * $this->loadIdsFor(\ProcessMaker\BusinessModel\TimerEvent::class, $arrayProcessData["PRO_UID"], $oData->timerEvent);
//$this->loadIdsFor(AbeConfiguration::class, $arrayProcessData["PRO_UID"], $oData->abeConfiguration); * $this->loadIdsFor(\ProcessMaker\BusinessModel\EmailEvent::class, $arrayProcessData["PRO_UID"], $oData->emailEvent);
//$this->loadIdsFor(\ProcessMaker\BusinessModel\FilesManager::class, $arrayProcessData["PRO_UID"], $oData->filesManager); * $this->loadIdsFor(AbeConfiguration::class, $arrayProcessData["PRO_UID"], $oData->abeConfiguration);
* $this->loadIdsFor(\ProcessMaker\BusinessModel\FilesManager::class, $arrayProcessData["PRO_UID"], $oData->filesManager);
*/
return $oData; return $oData;
} }
private function loadIdsFor($modelClass, $uidTableField, $idTableField, &$data) { private function loadIdsFor($modelClass, $uidTableField, $idTableField, &$data)
if(empty($data)) { {
if (empty($data)) {
return $data; return $data;
} }
if(!is_array($data)) { if (!is_array($data)) {
throw new \Exception("invalid input data form $modelClass($key)" . json_encode($data)); throw new Exception("Invalid input data form $modelClass($key)" . G::json_encode($data));
} }
$uidField = explode('.', $uidTableField)[1]; $uidField = explode('.', $uidTableField)[1];
$idField = explode('.', $idTableField)[1]; $idField = explode('.', $idTableField)[1];
if(isset($data[$uidField])) { if (isset($data[$uidField])) {
//$data is an sigle row //$data is an single row
$model = new $modelClass(); $model = new $modelClass();
$row = $model->load($data[$uidField]); $row = $model->load($data[$uidField]);
$data[$idField] = $model->getByName($idTableField, BasePeer::TYPE_COLNAME); $data[$idField] = $model->getByName($idTableField, BasePeer::TYPE_COLNAME);
} else { } else {
//$data is an array of row //$data is an array of row
foreach($data as &$dataRow) { foreach ($data as &$dataRow) {
$model = new $modelClass(); $model = new $modelClass();
$row = $model->load($dataRow[$uidField]); $row = $model->load($dataRow[$uidField]);
$dataRow[$idField] = $model->getByName($idTableField, BasePeer::TYPE_COLNAME); $dataRow[$idField] = $model->getByName($idTableField, BasePeer::TYPE_COLNAME);