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

Merged in dheeyi/processmaker/HOR-2018 (pull request #4992)

Browse Source 
R-2018
This commit is contained in:
Julio Cesar Laura Avendaño
2016-10-10 10:23:32 -04:00
parent 2c9ebc439c 468c25d392
commit cebaea0641
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
workflow/engine/classes/model/Process.php
View File

@@ -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)

9
workflow/engine/src/ProcessMaker/Importer/Importer.php
View File

@@ -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;