From d0c054cbf4f462862de31c60fd523dae6ea0dca6 Mon Sep 17 00:00:00 2001 From: Erik Amaru Ortiz Date: Wed, 14 Dec 2011 09:20:26 -0400 Subject: [PATCH] BUG 8166 "Notice al importar procesos" SOLVED - there were some 3 new validations for 3 variables to process importing, but not always they're set so, before validation we're askin if exists - the same por a variable dynaform when importing process the process already exists and a update was requested --- workflow/engine/classes/model/Process.php | 3 ++- workflow/engine/classes/model/Route.php | 14 ++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/workflow/engine/classes/model/Process.php b/workflow/engine/classes/model/Process.php index 24489e38f..63631d361 100755 --- a/workflow/engine/classes/model/Process.php +++ b/workflow/engine/classes/model/Process.php @@ -390,9 +390,10 @@ class Process extends BaseProcess { public function update($aData) { - if (is_array($aData['PRO_DYNAFORMS'])) { + if (isset($aData['PRO_DYNAFORMS']) && is_array($aData['PRO_DYNAFORMS'])) { $aData['PRO_DYNAFORMS'] = @serialize($aData['PRO_DYNAFORMS']); } + $con = Propel::getConnection( ProcessPeer::DATABASE_NAME ); try { $con->begin(); diff --git a/workflow/engine/classes/model/Route.php b/workflow/engine/classes/model/Route.php index 2da3a0409..d2d069aee 100755 --- a/workflow/engine/classes/model/Route.php +++ b/workflow/engine/classes/model/Route.php @@ -118,10 +118,16 @@ class Route extends BaseRoute { if (!is_null($oRoute)) { // validating default values - $aData['ROU_TO_LAST_USER'] = $this->validateValue($aData['ROU_TO_LAST_USER'], array('TRUE', 'FALSE'), 'FALSE'); - $aData['ROU_OPTIONAL'] = $this->validateValue($aData['ROU_OPTIONAL'], array('TRUE', 'FALSE'), 'FALSE'); - $aData['ROU_SEND_EMAIL'] = $this->validateValue($aData['ROU_SEND_EMAIL'], array('TRUE', 'FALSE'), 'TRUE'); - + if (isset($aData['ROU_TO_LAST_USER'])) { + $aData['ROU_TO_LAST_USER'] = $this->validateValue($aData['ROU_TO_LAST_USER'], array('TRUE', 'FALSE'), 'FALSE'); + } + if (isset($aData['ROU_OPTIONAL'])) { + $aData['ROU_OPTIONAL'] = $this->validateValue($aData['ROU_OPTIONAL'], array('TRUE', 'FALSE'), 'FALSE'); + } + if (isset($aData['ROU_SEND_EMAIL'])) { + $aData['ROU_SEND_EMAIL'] = $this->validateValue($aData['ROU_SEND_EMAIL'], array('TRUE', 'FALSE'), 'TRUE'); + } + $oRoute->fromArray($aData, BasePeer::TYPE_FIELDNAME); if ($oRoute->validate()) { $oConnection->begin();