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

HOR-3351

Browse Source
This commit is contained in:
Paula Quispe
2017-06-06 15:21:42 -04:00
parent 04c832fb54
commit 97c25a320e
3 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
workflow/engine/methods/processes/processes_Export.php
View File

@@ -39,7 +39,8 @@ try {
if (sizeof($_GET['objects']) == 0) {
/*----------------------------------********---------------------------------*/
$exporter = new ProcessMaker\Exporter\XmlExporter($_GET["pro_uid"]);
$getProjectName = $exporter->truncateName($exporter->getProjectName(), false);
$projectName = $exporter->getProjectName();
$getProjectName = $exporter->truncateName($projectName, false);
$version = ProcessMaker\Util\Common::getLastVersion($outputDir . $getProjectName . "-*.pmx") + 1;
$outputFilename = sprintf("%s-%s.%s", str_replace(" ", "_", $getProjectName), $version, "pmx");
@@ -48,8 +49,10 @@ try {
}else{
$granularExporter = new \ProcessMaker\BusinessModel\Migrator\GranularExporter($_GET['pro_uid']);
$outputFilename = $granularExporter->export($_GET['objects']);
$projectName = $granularExporter->getProjectName();
}
/*----------------------------------********---------------------------------*/
G::auditLog('ExportProcess','Export process "' . $projectName . '"');
} else {
$oProcess = new Processes();
$proFields = $oProcess->serializeProcess($_GET["pro_uid"]);
@@ -57,6 +60,7 @@ try {
$outputFilename = $result["FILENAME"];
rename($outputDir . $outputFilename . "tpm", $outputDir . $outputFilename);
G::auditLog('ExportProcess','Export process "' . $result["PRO_TITLE"] . '"');
}
$response->file_hash = base64_encode($outputFilename);
$response->success = true;

12
workflow/engine/src/ProcessMaker/BusinessModel/Migrator/GranularExporter.php
View File

@@ -12,6 +12,7 @@ class GranularExporter
protected $generator;
protected $data;
protected $prjuid;
protected $prjName = '';
/**
* GranularExporter constructor.
*/
@@ -60,6 +61,7 @@ class GranularExporter
$objectList = func_get_args()[0];
$bpmnProject = Project\Bpmn::load($this->prjuid);
$projectData = $bpmnProject->getProject();
$this->prjName = $projectData['PRJ_NAME'];
$getProjectName = $this->publisher->truncateName($projectData['PRJ_NAME'], false);
$outputDir = PATH_DATA . "sites" . PATH_SEP . SYS_SYS . PATH_SEP . "files" . PATH_SEP . "output" . PATH_SEP;
$version = \ProcessMaker\Util\Common::getLastVersion($outputDir . $getProjectName . "-*.pmx2") + 1;
@@ -172,7 +174,7 @@ class GranularExporter
}
}
}
return $migratorData;
return $migratorData;
}
public function publish()
@@ -184,4 +186,12 @@ class GranularExporter
)
);
}
/**
* Get the project name
*/
public function getProjectName()
{
return $this->prjName;
}
}

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

@@ -163,6 +163,9 @@ class Project extends Api
PATH_SEP . $outputFilename;
$httpStream = new HttpStream();
$fileExtension = pathinfo($outputFilename, PATHINFO_EXTENSION);
\G::auditLog('ExportProcess','Export process "' . $granularExporter->getProjectName() . '"');
$httpStream->loadFromFile($outputFilename);
$httpStream->setHeader("Content-Type", "application/xml; charset=UTF-8");
$httpStream->send();
@@ -188,6 +191,8 @@ class Project extends Api
$httpStream = new \ProcessMaker\Util\IO\HttpStream();
$fileExtension = pathinfo($outputFilename, PATHINFO_EXTENSION);
\G::auditLog('ExportProcess','Export process "' . $exporter->getProjectName() . '"');
$httpStream->loadFromFile($outputFilename);
$httpStream->setHeader("Content-Type", "application/xml; charset=UTF-8");
$httpStream->send();