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

BUG 8166 "Notice al importar procesos" SOLVED

Browse Source 
- 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
This commit is contained in:
Erik Amaru Ortiz
2011-12-14 09:20:26 -04:00
parent ecf09f4e65
commit d0c054cbf4
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -390,9 +390,10 @@ class Process extends BaseProcess {
public function update($aData) 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']); $aData['PRO_DYNAFORMS'] = @serialize($aData['PRO_DYNAFORMS']);
} }
$con = Propel::getConnection( ProcessPeer::DATABASE_NAME ); $con = Propel::getConnection( ProcessPeer::DATABASE_NAME );
try { try {
$con->begin(); $con->begin();

14
workflow/engine/classes/model/Route.php
View File

@@ -118,10 +118,16 @@ class Route extends BaseRoute {
if (!is_null($oRoute)) if (!is_null($oRoute))
{ {
// validating default values // validating default values
$aData['ROU_TO_LAST_USER'] = $this->validateValue($aData['ROU_TO_LAST_USER'], array('TRUE', 'FALSE'), 'FALSE'); if (isset($aData['ROU_TO_LAST_USER'])) {
$aData['ROU_OPTIONAL'] = $this->validateValue($aData['ROU_OPTIONAL'], array('TRUE', 'FALSE'), 'FALSE'); $aData['ROU_TO_LAST_USER'] = $this->validateValue($aData['ROU_TO_LAST_USER'], array('TRUE', 'FALSE'), 'FALSE');
$aData['ROU_SEND_EMAIL'] = $this->validateValue($aData['ROU_SEND_EMAIL'], array('TRUE', 'FALSE'), 'TRUE'); }
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); $oRoute->fromArray($aData, BasePeer::TYPE_FIELDNAME);
if ($oRoute->validate()) { if ($oRoute->validate()) {
$oConnection->begin(); $oConnection->begin();