From 50d5608a27b50710b5076d27d85b5054e898b72f Mon Sep 17 00:00:00 2001 From: Daniel Rojas Date: Mon, 21 Apr 2014 08:56:13 -0400 Subject: [PATCH] Se ajusta validacion de roles para users. --- workflow/engine/src/ProcessMaker/BusinessModel/User.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/User.php b/workflow/engine/src/ProcessMaker/BusinessModel/User.php index 95fd73aa1..dc5090d87 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/User.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/User.php @@ -325,12 +325,12 @@ class User if ($form['USR_ROLE'] == '') { throw new \Exception('Invalid value specified for `usr_role`, can`t be null'); } else { + require_once (PATH_RBAC_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "Roles.php"); $oCriteria = new \Criteria('rbac'); $oCriteria->add(\RolesPeer::ROL_CODE, $form['USR_ROLE']); $oDataset = \RolesPeer::doSelectRS($oCriteria); $oDataset->setFetchmode(\ResultSet::FETCHMODE_ASSOC); $oDataset->next(); - $aRow = $oDataset->getRow(); if ($oDataset->getRow()) { $aData['USR_ROLE'] = $form['USR_ROLE']; } else { @@ -531,12 +531,12 @@ class User $aData['USR_STATUS'] = $form['USR_STATUS']; } if ($form['USR_ROLE'] != '') { + require_once (PATH_RBAC_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "Roles.php"); $oCriteria = new \Criteria('rbac'); $oCriteria->add(\RolesPeer::ROL_CODE, $form['USR_ROLE']); $oDataset = \RolesPeer::doSelectRS($oCriteria); $oDataset->setFetchmode(\ResultSet::FETCHMODE_ASSOC); $oDataset->next(); - $aRow = $oDataset->getRow(); if ($oDataset->getRow()) { $aData['USR_ROLE'] = $form['USR_ROLE']; } else {