fernando/luos
1
0
Fork 0
Code Releases Activity

HOR-2410

Browse Source 
[MANTIS 21724]: Process Design Access: The Option "Private" causes the process to disappear
This commit is contained in:
dheeyi william
2017-04-11 14:57:56 -04:00
parent 37c44e0ac5
commit 7a998ea9c0
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,6 +14,7 @@ abstract class Importer
protected $filename = ""; protected $filename = "";
protected $saveDir = ""; protected $saveDir = "";
protected $metadata = array(); protected $metadata = array();
protected $prjCreateUser = '';
/** /**
* Title of the process before being updated/deleted. * Title of the process before being updated/deleted.
* @var string * @var string
@@ -494,6 +495,7 @@ abstract class Importer
$project["diagrams"] = array($diagram); $project["diagrams"] = array($diagram);
$project["prj_author"] = isset($this->data["usr_uid"])? $this->data["usr_uid"]: "00000000000000000000000000000001"; $project["prj_author"] = isset($this->data["usr_uid"])? $this->data["usr_uid"]: "00000000000000000000000000000001";
$project["process"] = $tables["process"][0]; $project["process"] = $tables["process"][0];
$project["prjCreateUser"] = $this->prjCreateUser;
return Adapter\BpmnWorkflow::createFromStruct($project, $generateUid); return Adapter\BpmnWorkflow::createFromStruct($project, $generateUid);
} }
@@ -761,7 +763,7 @@ abstract class Importer
} }
} }
public function saveAs($prj_uid, $prj_name, $prj_description, $prj_category) public function saveAs($prj_uid, $prj_name, $prj_description, $prj_category, $prj_user = '')
{ {
try { try {
$exporter = new \ProcessMaker\Exporter\XmlExporter($prj_uid); $exporter = new \ProcessMaker\Exporter\XmlExporter($prj_uid);
@@ -779,6 +781,7 @@ abstract class Importer
$this->setSourceFile($outputFilename); $this->setSourceFile($outputFilename);
$this->prepare(); $this->prepare();
$this->prjCreateUser = $prj_user;
$this->importData["tables"]["bpmn"]["project"][0]["prj_name"] = $prj_name; $this->importData["tables"]["bpmn"]["project"][0]["prj_name"] = $prj_name;
$this->importData["tables"]["bpmn"]["project"][0]["prj_description"] = $prj_description; $this->importData["tables"]["bpmn"]["project"][0]["prj_description"] = $prj_description;
$this->importData["tables"]["bpmn"]["diagram"][0]["dia_name"] = $prj_name; $this->importData["tables"]["bpmn"]["diagram"][0]["dia_name"] = $prj_name;

8
workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
View File

@@ -94,6 +94,10 @@ class BpmnWorkflow extends Project\Bpmn
$wpData["PRO_STATUS"] = $data["PRO_STATUS"]; $wpData["PRO_STATUS"] = $data["PRO_STATUS"];
} }
if (array_key_exists("PRO_CREATE_USER", $data)) {
$wpData["PRO_CREATE_USER"] = $data["PRO_CREATE_USER"];
}
$this->wp = new Project\Workflow(); $this->wp = new Project\Workflow();
$this->wp->create($wpData); $this->wp->create($wpData);
@@ -1318,6 +1322,10 @@ class BpmnWorkflow extends Project\Bpmn
$data["PRO_STATUS"] = $projectData['pro_status']; $data["PRO_STATUS"] = $projectData['pro_status'];
} }
if (isset($projectData['prjCreateUser'])){
$data["PRO_CREATE_USER"] = $projectData['prjCreateUser'];
}
$bwp->create($data); $bwp->create($data);
$diagramData = $processData = array(); $diagramData = $processData = array();

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

@@ -221,7 +221,7 @@ class Project extends Api
public function doSaveAs($prj_uid, $prj_name, $prj_description = null, $prj_category = null) 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, $this->getUserId());
} }
/** /**