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

MT-76: Fixed the case when the update for process defintion was broken. Please Review.

Browse Source
This commit is contained in:
Gustavo Adolfo Cruz Laura
2016-04-02 13:06:28 -04:00
parent 58b21bf312
commit cd0611c9f5
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,6 +6,7 @@
namespace ProcessMaker\BusinessModel\Migrator;
use ProcessMaker\Importer\XmlImporter;
use ProcessMaker\Project\Adapter;
class GranularImporter
@@ -182,13 +183,15 @@ class GranularImporter
* @return bool
* @throws \Exception
*/
public function validateImportData($objectList)
public function validateImportData($objectList, $option)
{
try {
if (count($objectList) !== count($this->exportObjects->getObjectsList())) {
$exception = new ImportException();
$exception->setNameException(\G::LoadTranslation('ID_PROCESS_DEFINITION_INCOMPLETE'));
throw($exception);
if (XmlImporter::IMPORT_OPTION_OVERWRITE !== $option) {
if (count($objectList) !== count($this->exportObjects->getObjectsList())) {
$exception = new ImportException();
$exception->setNameException(\G::LoadTranslation('ID_PROCESS_DEFINITION_INCOMPLETE'));
throw($exception);
}
}
return true;
} catch (\Exception $e) {

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

@@ -234,7 +234,7 @@ abstract class Importer
$granularObj = new \ProcessMaker\BusinessModel\Migrator\GranularImporter();
$newObjectArray = $objectsToImport;
$projectUid = $this->importData['tables']['bpmn']["project"][0]["prj_uid"];
$processGranulate = $granularObj->validateImportData($objectsToImport);
$processGranulate = $granularObj->validateImportData($objectsToImport, $option);
if($generateUid){
$result = $granularObj->regenerateAllUids($this->importData, $generateUid);
$this->importData = $result['data'];