diff --git a/workflow/engine/classes/model/Process.php b/workflow/engine/classes/model/Process.php index 764f4ac5a..3fb896ff2 100644 --- a/workflow/engine/classes/model/Process.php +++ b/workflow/engine/classes/model/Process.php @@ -503,16 +503,21 @@ class Process extends BaseProcess return (is_object( $oPro ) && get_class( $oPro ) == 'Process'); } - public static function existsByProTitle ($proTitle) + /** + * @param $proTitle + * @return bool + * @throws PropelException + */ + public static function existsByProTitle($proTitle) { $oCriteria = new Criteria("workflow"); $oCriteria->addSelectColumn(ProcessPeer::PRO_TITLE); - $oCriteria->add( ProcessPeer::PRO_TITLE, $proTitle ); - $oDataset = ProcessPeer::doSelectRS( $oCriteria, Propel::getDbConnection('workflow_ro') ); - $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); + $oCriteria->add(ProcessPeer::PRO_TITLE, $proTitle); + $oDataset = ProcessPeer::doSelectRS($oCriteria, Propel::getDbConnection('workflow_ro')); + $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->next(); $aRow = $oDataset->getRow(); - return ($aRow)? true : false; + return ($aRow) ? true : false; } public static function getByProTitle($proTitle) diff --git a/workflow/engine/src/ProcessMaker/Importer/Importer.php b/workflow/engine/src/ProcessMaker/Importer/Importer.php index d5b5ae14c..65b79061c 100644 --- a/workflow/engine/src/ProcessMaker/Importer/Importer.php +++ b/workflow/engine/src/ProcessMaker/Importer/Importer.php @@ -81,7 +81,6 @@ abstract class Importer public function import($option = self::IMPORT_OPTION_CREATE_NEW, $optionGroup = self::GROUP_IMPORT_OPTION_CREATE_NEW, $generateUidFromJs = null, $objectsToImport = '') { $this->prepare(); - //Verify data switch ($option) { case self::IMPORT_OPTION_CREATE_NEW: @@ -159,13 +158,11 @@ abstract class Importer //Import $name = $this->importData["tables"]["bpmn"]["project"][0]["prj_name"]; - - if (\Process::existsByProTitle($name) && !is_null($generateUidFromJs)) { - $name = $name . ' ' . date('Y-m-d H:i:s'); - } - switch ($option) { case self::IMPORT_OPTION_CREATE_NEW: + if (\Process::existsByProTitle($name) && !is_null($generateUidFromJs)) { + $name = $name . ' ' . date('Y-m-d H:i:s'); + } //Shouldn't generate new UID for all objects $generateUid = false; break;