diff --git a/workflow/engine/classes/class.processes.php b/workflow/engine/classes/class.processes.php index e97ef9260..b2a005727 100755 --- a/workflow/engine/classes/class.processes.php +++ b/workflow/engine/classes/class.processes.php @@ -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); diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/FileHandler.php b/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/FileHandler.php index 28e6eb53e..83daab025 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/FileHandler.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/FileHandler.php @@ -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(); diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/FilesMigrator.php b/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/FilesMigrator.php index 03c033a56..ec2fc36ab 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/FilesMigrator.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/FilesMigrator.php @@ -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, diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/TemplatesMigrator.php b/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/TemplatesMigrator.php index d92e5393c..378356900 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/TemplatesMigrator.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/TemplatesMigrator.php @@ -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,