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

Merge branch 'master' of bitbucket.org:colosa/processmaker

Browse Source
This commit is contained in:
Brayan Osmar Pereyra Suxo
2014-05-14 15:56:39 -04:00
parent d83e2b2d46 bdde62e17b
commit 5df1781f23
25 changed files with 1421 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -120,7 +120,7 @@ class Project extends Api
$fileExtension = pathinfo($outputFilename, PATHINFO_EXTENSION);
$httpStream->loadFromFile($outputFilename);
$httpStream->setHeader("Content-Type", "application/$fileExtension");
$httpStream->setHeader("Content-Type", "application/xml; charset=UTF-8");
$httpStream->send();
}
@@ -136,6 +136,7 @@ class Project extends Api
try {
$importer = new \ProcessMaker\Importer\XmlImporter();
$importer->setSaveDir(PATH_DOCUMENT . "input");
$importer->setData("usr_uid", $this->getUserId());
$arrayData = $importer->importPostFile($request_data, $option, array("projectFile" => "project_file", "option" => "option"));