fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in paulis/processmaker/MT-12-B (pull request #3923)

Browse Source 
MT-12: i solved problems in Templates and files exportation
This commit is contained in:
Gustavo Cruz
2016-03-23 16:28:32 -04:00
parent 9400ecc204 13a7c14cbd
commit 7ad8e6b1fc
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/class.processes.php
View File

@@ -3502,7 +3502,7 @@ class Processes
$criteria->addSelectColumn(\ProcessFilesPeer::PRF_UPDATE_DATE);
$criteria->add(ProcessFilesPeer::PRO_UID, $processUid, Criteria::EQUAL);
if ($template !== 'all') {
if ($template !== 'template') {
if ($template === 'template') {
$criteria->add(ProcessFilesPeer::PRF_EDITABLE, true, Criteria::EQUAL);
} else {
$criteria->add(ProcessFilesPeer::PRF_EDITABLE, false, Criteria::EQUAL);

2
workflow/engine/src/ProcessMaker/BusinessModel/Migrator/FileHandler.php
View File

@@ -24,7 +24,7 @@ class FileHandler
$criteria->add(\WebEntryPeer::WE_METHOD, "WS", \Criteria::EQUAL);
$rsCriteria = \WebEntryPeer::doSelectRS($criteria);
$rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
while ($rsCriteria->next()) {
$row = $rsCriteria->getRow();

4
workflow/engine/src/ProcessMaker/BusinessModel/Migrator/FilesMigrator.php
View File

@@ -89,11 +89,11 @@ class FilesMigrator implements Importable, Exportable
{
try {
$oData = new \StdClass();
$oData->filesManager = $this->processes->getFilesManager($prj_uid, 'PUBLIC');
$oData->filesManager = $this->processes->getFilesManager($prj_uid, 'public');
$fileHandler = new FileHandler();
$arrayPublicFileToExclude = $fileHandler->getFilesToExclude($prj_uid);
$workflowFile = $fileHandler->getTemplatesOrPublicFiles($prj_uid, $arrayPublicFileToExclude, 'PUBLIC');
$workflowFile = $fileHandler->getTemplatesOrPublicFiles($prj_uid, $arrayPublicFileToExclude, 'public');
$result = array(
'workflow-definition' => (array)$oData,

4
workflow/engine/src/ProcessMaker/BusinessModel/Migrator/TemplatesMigrator.php
View File

@@ -89,10 +89,10 @@ class TemplatesMigrator implements Importable, Exportable
try {
$oData = new \StdClass();
$arrayExcludeFile = array();
$oData->filesManager = $this->processes->getFilesManager($prj_uid, 'TEMPLATES');
$oData->filesManager = $this->processes->getFilesManager($prj_uid, 'template');
$fileHandler = new FileHandler();
$workflowFile = $fileHandler->getTemplatesOrPublicFiles($prj_uid, $arrayExcludeFile, 'TEMPLATES');
$workflowFile = $fileHandler->getTemplatesOrPublicFiles($prj_uid, $arrayExcludeFile, 'template');
$result = array(
'workflow-definition' => (array)$oData,