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

Merged in victorsl/processmaker/HOR-1642-31 (pull request #4796)

Browse Source 
HOR-1642
This commit is contained in:
Julio Cesar Laura Avendaño
2016-08-19 18:07:39 -04:00
parent bfe86525f1 f72bc4b864
commit cc6380fb4a
2 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -367,7 +367,7 @@ abstract class Importer
/** /**
* Check tasks that have cases. * Check tasks that have cases.
* *
* @return boolean * @return boolean
*/ */
public function verifyIfTheProcessHasStartedCases() public function verifyIfTheProcessHasStartedCases()
@@ -500,7 +500,7 @@ abstract class Importer
$workflow->createDataFileByArrayFile($workflowFiles); $workflow->createDataFileByArrayFile($workflowFiles);
} }
public function doImport($generateUid = true) public function doImport($generateUid = true, $flagDeleteCategory = true)
{ {
try { try {
$arrayBpmnTables = $this->importData["tables"]["bpmn"]; $arrayBpmnTables = $this->importData["tables"]["bpmn"];
@@ -543,8 +543,13 @@ abstract class Importer
unset($arrayWorkflowTables["process"]["PRO_CREATE_USER"]); unset($arrayWorkflowTables["process"]["PRO_CREATE_USER"]);
unset($arrayWorkflowTables["process"]["PRO_CREATE_DATE"]); unset($arrayWorkflowTables["process"]["PRO_CREATE_DATE"]);
unset($arrayWorkflowTables["process"]["PRO_UPDATE_DATE"]); unset($arrayWorkflowTables["process"]["PRO_UPDATE_DATE"]);
unset($arrayWorkflowTables["process"]["PRO_CATEGORY"]);
unset($arrayWorkflowTables["process"]["PRO_CATEGORY_LABEL"]); if ($flagDeleteCategory) {
unset(
$arrayWorkflowTables['process']['PRO_CATEGORY'],
$arrayWorkflowTables['process']['PRO_CATEGORY_LABEL']
);
}
$workflow->update($arrayWorkflowTables["process"]); $workflow->update($arrayWorkflowTables["process"]);
@@ -742,10 +747,10 @@ abstract class Importer
$this->importData["tables"]["workflow"]["process"][0]["PRO_CATEGORY_LABEL"] = null; $this->importData["tables"]["workflow"]["process"][0]["PRO_CATEGORY_LABEL"] = null;
$this->importData["tables"]["workflow"]["process"][0]["PRO_UPDATE_DATE"] = null; $this->importData["tables"]["workflow"]["process"][0]["PRO_UPDATE_DATE"] = null;
$this->importData["tables"]["workflow"]["process"] = $this->importData["tables"]["workflow"]["process"][0]; $this->importData["tables"]["workflow"]["process"] = $this->importData["tables"]["workflow"]["process"][0];
return array("prj_uid" => $this->doImport());
return ['prj_uid' => $this->doImport(true, false)];
} catch (\Exception $e) { } catch (\Exception $e) {
return $e->getMessage(); return $e->getMessage();
} }
} }
} }

19
workflow/engine/src/ProcessMaker/Services/Api/Project.php
View File

@@ -209,16 +209,16 @@ class Project extends Api
throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage())); throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()));
} }
} }
/** /**
* @url POST /save-as * @url POST /save-as
* *
* @param string $prj_uid * @param string $prj_uid {@from body}
* @param string $prj_name * @param string $prj_name {@from body}
* @param string $prj_description * @param string $prj_description {@from body}
* @param string $prj_category * @param string $prj_category {@from body}
*/ */
public function doSaveAs($prj_uid, $prj_name, $prj_description, $prj_category) public function doSaveAs($prj_uid, $prj_name, $prj_description = null, $prj_category = null)
{ {
$importer = new \ProcessMaker\Importer\XmlImporter(); $importer = new \ProcessMaker\Importer\XmlImporter();
return $importer->saveAs($prj_uid, $prj_name, $prj_description, $prj_category); return $importer->saveAs($prj_uid, $prj_name, $prj_description, $prj_category);
@@ -404,7 +404,7 @@ class Project extends Api
throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage())); throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()));
} }
} }
/** /**
* @url PUT /:prj_uid/update-route-order * @url PUT /:prj_uid/update-route-order
* *
@@ -420,7 +420,7 @@ class Project extends Api
throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()); throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
} }
} }
/** /**
* @url PUT /:prj_uid/update-route-order-from-project * @url PUT /:prj_uid/update-route-order-from-project
* *
@@ -437,4 +437,3 @@ class Project extends Api
} }
} }
} }