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

BUG 8444 Remove permission PM_REPORTS, since it no longer serves any purpose SOLVED

Browse Source 
- The permission PM_REPORTS cannot be removed because many projects already used (plugins made by projects), then the permision has changed to status inactive and in new installations will be hidden in the permision administrator module
This commit is contained in:
Julio Cesar Laura
2012-07-19 11:08:49 -04:00
parent 668ae7365e
commit 6dd48d4b00
3 changed files with 113 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gulliver/system/class.rbac.php
View File

@@ -738,8 +738,8 @@ class RBAC
* @param string $ROL_UID * @param string $ROL_UID
* @return $this->rolesObj->getRolePermissions * @return $this->rolesObj->getRolePermissions
*/ */
function getRolePermissions($ROL_UID, $filter=''){ function getRolePermissions($ROL_UID, $filter='', $status=null){
return $this->rolesObj->getRolePermissions($ROL_UID,$filter); return $this->rolesObj->getRolePermissions($ROL_UID, $filter, $status);
} }
/** /**
@@ -752,8 +752,8 @@ class RBAC
* @param string $PER_SYSTEM * @param string $PER_SYSTEM
* @return $this->rolesObj->getAllPermissions * @return $this->rolesObj->getAllPermissions
*/ */
function getAllPermissions($ROL_UID,$PER_SYSTEM="",$filter=''){ function getAllPermissions($ROL_UID, $PER_SYSTEM="", $filter='', $status=null){
return $this->rolesObj->getAllPermissions($ROL_UID,$PER_SYSTEM,$filter); return $this->rolesObj->getAllPermissions($ROL_UID, $PER_SYSTEM, $filter, $status);
} }
/** /**

206
rbac/engine/classes/model/Roles.php
View File

@@ -2,10 +2,10 @@
/** /**
* Roles.php * Roles.php
* @package rbac-classes-model * @package rbac-classes-model
* *
* ProcessMaker Open Source Edition * ProcessMaker Open Source Edition
* Copyright (C) 2004 - 2011 Colosa Inc. * Copyright (C) 2004 - 2011 Colosa Inc.
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as * it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the * published by the Free Software Foundation, either version 3 of the
@@ -15,13 +15,13 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details. * GNU Affero General Public License for more details.
* *
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
* For more information, contact Colosa Inc, 2566 Le Jeune Rd., * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
* Coral Gables, FL, 33134, USA, or email info@colosa.com. * Coral Gables, FL, 33134, USA, or email info@colosa.com.
* *
*/ */
/** /**
* @access public * @access public
@@ -48,7 +48,7 @@ require_once 'classes/model/Content.php';
* @package rbac-classes-model * @package rbac-classes-model
*/ */
class Roles extends BaseRoles { class Roles extends BaseRoles {
public $rol_name; public $rol_name;
/** /**
@@ -63,10 +63,10 @@ class Roles extends BaseRoles {
$aFields = $oRow->toArray(BasePeer::TYPE_FIELDNAME); $aFields = $oRow->toArray(BasePeer::TYPE_FIELDNAME);
$this->fromArray($aFields, BasePeer::TYPE_FIELDNAME); $this->fromArray($aFields, BasePeer::TYPE_FIELDNAME);
$this->setNew(false); $this->setNew(false);
$this->getRolName(); $this->getRolName();
$aFields['ROL_NAME'] = $this->rol_name; $aFields['ROL_NAME'] = $this->rol_name;
return $aFields; return $aFields;
} else { } else {
throw (new Exception("The '$Uid' row doesn't exist!")); throw (new Exception("The '$Uid' row doesn't exist!"));
@@ -75,7 +75,7 @@ class Roles extends BaseRoles {
throw ($oError); throw ($oError);
} }
} }
function loadByCode($sRolCode = '') { function loadByCode($sRolCode = '') {
try { try {
$oCriteria = new Criteria('rbac'); $oCriteria = new Criteria('rbac');
@@ -93,10 +93,10 @@ class Roles extends BaseRoles {
throw ($oError); throw ($oError);
} }
} }
function listAllRoles($systemCode = 'PROCESSMAKER', $filter = '') { function listAllRoles($systemCode = 'PROCESSMAKER', $filter = '') {
try { try {
$oCriteria = new Criteria('rbac'); $oCriteria = new Criteria('rbac');
$oCriteria->addSelectColumn(RolesPeer::ROL_UID); $oCriteria->addSelectColumn(RolesPeer::ROL_UID);
$oCriteria->addSelectColumn(RolesPeer::ROL_PARENT); $oCriteria->addSelectColumn(RolesPeer::ROL_PARENT);
@@ -112,24 +112,24 @@ class Roles extends BaseRoles {
$oCriteria->add(RolesPeer::ROL_UPDATE_DATE, '', Criteria::NOT_EQUAL); $oCriteria->add(RolesPeer::ROL_UPDATE_DATE, '', Criteria::NOT_EQUAL);
//Added by QENNIX Jan 21th, 2011 //Added by QENNIX Jan 21th, 2011
if ($filter != ''){ if ($filter != ''){
$oCriteria->add(RolesPeer::ROL_CODE, '%'.$filter.'%', Criteria::LIKE); $oCriteria->add(RolesPeer::ROL_CODE, '%'.$filter.'%', Criteria::LIKE);
} }
$oCriteria->addJoin(RolesPeer::ROL_SYSTEM, SystemsPeer::SYS_UID); $oCriteria->addJoin(RolesPeer::ROL_SYSTEM, SystemsPeer::SYS_UID);
return $oCriteria; return $oCriteria;
} catch( exception $oError ) { } catch( exception $oError ) {
throw (new Exception("Class ROLES::FATAL ERROR. Criteria with rbac Can't initialized ")); throw (new Exception("Class ROLES::FATAL ERROR. Criteria with rbac Can't initialized "));
} }
} }
//Added by QENNIX //Added by QENNIX
function getAllRolesFilter($start, $limit, $filter='') { function getAllRolesFilter($start, $limit, $filter='') {
//echo $start.'<<<<'.$limit; //echo $start.'<<<<'.$limit;
$systemCode = 'PROCESSMAKER'; $systemCode = 'PROCESSMAKER';
$oCriteria2 = new Criteria('rbac'); $oCriteria2 = new Criteria('rbac');
$result = Array(); $result = Array();
$oCriteria2->addSelectColumn('COUNT(*) AS CNT'); $oCriteria2->addSelectColumn('COUNT(*) AS CNT');
$oCriteria2->add(RolesPeer::ROL_UID, '', Criteria::NOT_EQUAL); $oCriteria2->add(RolesPeer::ROL_UID, '', Criteria::NOT_EQUAL);
$oCriteria2->add(SystemsPeer::SYS_CODE, $systemCode); $oCriteria2->add(SystemsPeer::SYS_CODE, $systemCode);
@@ -137,7 +137,7 @@ class Roles extends BaseRoles {
$oCriteria2->add(RolesPeer::ROL_UPDATE_DATE, '', Criteria::NOT_EQUAL); $oCriteria2->add(RolesPeer::ROL_UPDATE_DATE, '', Criteria::NOT_EQUAL);
$oCriteria2->addJoin(RolesPeer::ROL_SYSTEM, SystemsPeer::SYS_UID); $oCriteria2->addJoin(RolesPeer::ROL_SYSTEM, SystemsPeer::SYS_UID);
if ($filter != ''){ if ($filter != ''){
$oCriteria2->add(RolesPeer::ROL_CODE, '%'.$filter.'%', Criteria::LIKE); $oCriteria2->add(RolesPeer::ROL_CODE, '%'.$filter.'%', Criteria::LIKE);
} }
$result['COUNTER'] = $oCriteria2; $result['COUNTER'] = $oCriteria2;
$oCriteria = new Criteria('rbac'); $oCriteria = new Criteria('rbac');
@@ -155,28 +155,28 @@ class Roles extends BaseRoles {
$oCriteria->add(RolesPeer::ROL_CREATE_DATE, '', Criteria::NOT_EQUAL); $oCriteria->add(RolesPeer::ROL_CREATE_DATE, '', Criteria::NOT_EQUAL);
$oCriteria->add(RolesPeer::ROL_UPDATE_DATE, '', Criteria::NOT_EQUAL); $oCriteria->add(RolesPeer::ROL_UPDATE_DATE, '', Criteria::NOT_EQUAL);
$oCriteria->addJoin(RolesPeer::ROL_SYSTEM, SystemsPeer::SYS_UID); $oCriteria->addJoin(RolesPeer::ROL_SYSTEM, SystemsPeer::SYS_UID);
if ($filter != ''){ if ($filter != ''){
$oCriteria->add(RolesPeer::ROL_CODE, '%'.$filter.'%', Criteria::LIKE); $oCriteria->add(RolesPeer::ROL_CODE, '%'.$filter.'%', Criteria::LIKE);
} }
$oCriteria->setOffset($start); $oCriteria->setOffset($start);
$oCriteria->setLimit($limit); $oCriteria->setLimit($limit);
$result['LIST'] = $oCriteria; $result['LIST'] = $oCriteria;
return $result; return $result;
} }
function getAllRoles($systemCode = 'PROCESSMAKER') { function getAllRoles($systemCode = 'PROCESSMAKER') {
$c = $this->listAllRoles($systemCode); $c = $this->listAllRoles($systemCode);
$rs = RolesPeer::DoSelectRs($c); $rs = RolesPeer::DoSelectRs($c);
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC); $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$aRows = Array(); $aRows = Array();
while($rs->next()){ while($rs->next()){
$row = $rs->getRow(); $row = $rs->getRow();
@@ -188,7 +188,7 @@ class Roles extends BaseRoles {
return $aRows; return $aRows;
} }
function listAllPermissions($systemCode = 'PROCESSMAKER') { function listAllPermissions($systemCode = 'PROCESSMAKER') {
try { try {
$oCriteria = new Criteria('rbac'); $oCriteria = new Criteria('rbac');
@@ -198,14 +198,14 @@ class Roles extends BaseRoles {
$oCriteria->addSelectColumn(PermissionsPeer::PER_UPDATE_DATE); $oCriteria->addSelectColumn(PermissionsPeer::PER_UPDATE_DATE);
$oCriteria->addSelectColumn(PermissionsPeer::PER_STATUS); $oCriteria->addSelectColumn(PermissionsPeer::PER_STATUS);
$oCriteria->add(PermissionsPeer::PER_CODE, substr($systemCode, 0, 3) . '_%', Criteria::LIKE); $oCriteria->add(PermissionsPeer::PER_CODE, substr($systemCode, 0, 3) . '_%', Criteria::LIKE);
return $oCriteria; return $oCriteria;
} catch( exception $oError ) { } catch( exception $oError ) {
throw (new Exception("Class ROLES::FATAL ERROR. Criteria with rbac Can't initialized ")); throw (new Exception("Class ROLES::FATAL ERROR. Criteria with rbac Can't initialized "));
} }
} }
function createRole($aData) { function createRole($aData) {
$con = Propel::getConnection(RolesPeer::DATABASE_NAME); $con = Propel::getConnection(RolesPeer::DATABASE_NAME);
try { try {
@@ -222,18 +222,18 @@ class Roles extends BaseRoles {
if (is_array($aRow)) { if (is_array($aRow)) {
return $aRow; return $aRow;
} }
$rol_name = $aData['ROL_NAME']; $rol_name = $aData['ROL_NAME'];
unset($aData['ROL_NAME']); unset($aData['ROL_NAME']);
$obj = new Roles(); $obj = new Roles();
$obj->fromArray($aData, BasePeer::TYPE_FIELDNAME); $obj->fromArray($aData, BasePeer::TYPE_FIELDNAME);
if ($obj->validate()) { if ($obj->validate()) {
$result = $obj->save(); $result = $obj->save();
$con->commit(); $con->commit();
$obj->setRolName($rol_name); $obj->setRolName($rol_name);
} else { } else {
$e = new Exception("Failed Validation in class " . get_class($this) . "."); $e = new Exception("Failed Validation in class " . get_class($this) . ".");
$e->aValidationFailures = $this->getValidationFailures(); $e->aValidationFailures = $this->getValidationFailures();
@@ -245,7 +245,7 @@ class Roles extends BaseRoles {
throw ($e); throw ($e);
} }
} }
public function updateRole($fields) { public function updateRole($fields) {
$con = Propel::getConnection(RolesPeer::DATABASE_NAME); $con = Propel::getConnection(RolesPeer::DATABASE_NAME);
try { try {
@@ -253,12 +253,12 @@ class Roles extends BaseRoles {
$this->load($fields['ROL_UID']); $this->load($fields['ROL_UID']);
$rol_name = $fields['ROL_NAME']; $rol_name = $fields['ROL_NAME'];
unset($fields['ROL_NAME']); unset($fields['ROL_NAME']);
$this->fromArray($fields, BasePeer::TYPE_FIELDNAME); $this->fromArray($fields, BasePeer::TYPE_FIELDNAME);
if ($this->validate()) { if ($this->validate()) {
$result = $this->save(); $result = $this->save();
$con->commit(); $con->commit();
$this->setRolName($rol_name); $this->setRolName($rol_name);
return $result; return $result;
} else { } else {
@@ -270,7 +270,7 @@ class Roles extends BaseRoles {
throw ($e); throw ($e);
} }
} }
function removeRole($ROL_UID) { function removeRole($ROL_UID) {
$con = Propel::getConnection(RolesPeer::DATABASE_NAME); $con = Propel::getConnection(RolesPeer::DATABASE_NAME);
try { try {
@@ -278,7 +278,7 @@ class Roles extends BaseRoles {
$this->setRolUid($ROL_UID); $this->setRolUid($ROL_UID);
Content::removeContent('ROL_NAME', '', $this->getRolUid()); Content::removeContent('ROL_NAME', '', $this->getRolUid());
$result = $this->delete(); $result = $this->delete();
$con->commit(); $con->commit();
return $result; return $result;
} catch( exception $e ) { } catch( exception $e ) {
@@ -286,23 +286,23 @@ class Roles extends BaseRoles {
throw ($e); throw ($e);
} }
} }
function verifyNewRole($code) { function verifyNewRole($code) {
$code = trim($code); $code = trim($code);
$oCriteria = new Criteria('rbac'); $oCriteria = new Criteria('rbac');
$oCriteria->addSelectColumn(RolesPeer::ROL_UID); $oCriteria->addSelectColumn(RolesPeer::ROL_UID);
$oCriteria->add(RolesPeer::ROL_CODE, $code); $oCriteria->add(RolesPeer::ROL_CODE, $code);
$count = RolesPeer::doCount($oCriteria); $count = RolesPeer::doCount($oCriteria);
if ($count == 0) { if ($count == 0) {
return true; return true;
} else { } else {
return false; return false;
} }
} }
function loadById($ROL_UID) { function loadById($ROL_UID) {
$oCriteria = new Criteria('rbac'); $oCriteria = new Criteria('rbac');
$oCriteria->addSelectColumn(RolesPeer::ROL_UID); $oCriteria->addSelectColumn(RolesPeer::ROL_UID);
$oCriteria->addSelectColumn(RolesPeer::ROL_PARENT); $oCriteria->addSelectColumn(RolesPeer::ROL_PARENT);
@@ -312,11 +312,11 @@ class Roles extends BaseRoles {
$oCriteria->addSelectColumn(RolesPeer::ROL_UPDATE_DATE); $oCriteria->addSelectColumn(RolesPeer::ROL_UPDATE_DATE);
$oCriteria->addSelectColumn(RolesPeer::ROL_STATUS); $oCriteria->addSelectColumn(RolesPeer::ROL_STATUS);
$oCriteria->add(RolesPeer::ROL_UID, $ROL_UID); $oCriteria->add(RolesPeer::ROL_UID, $ROL_UID);
$result = RolesPeer::doSelectRS($oCriteria); $result = RolesPeer::doSelectRS($oCriteria);
$result->setFetchmode(ResultSet::FETCHMODE_ASSOC); $result->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$result->next(); $result->next();
$row = $result->getRow(); $row = $result->getRow();
if (is_array($row)) { if (is_array($row)) {
$o = RolesPeer::retrieveByPK($row['ROL_UID']); $o = RolesPeer::retrieveByPK($row['ROL_UID']);
@@ -326,22 +326,22 @@ class Roles extends BaseRoles {
return null; return null;
} }
} }
function getRoleCode($ROL_UID) { function getRoleCode($ROL_UID) {
$oCriteria = new Criteria('rbac'); $oCriteria = new Criteria('rbac');
$oCriteria->addSelectColumn(RolesPeer::ROL_UID); $oCriteria->addSelectColumn(RolesPeer::ROL_UID);
$oCriteria->addSelectColumn(RolesPeer::ROL_CODE); $oCriteria->addSelectColumn(RolesPeer::ROL_CODE);
$oCriteria->add(RolesPeer::ROL_UID, $ROL_UID); $oCriteria->add(RolesPeer::ROL_UID, $ROL_UID);
$result = RolesPeer::doSelectRS($oCriteria); $result = RolesPeer::doSelectRS($oCriteria);
$result->setFetchmode(ResultSet::FETCHMODE_ASSOC); $result->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$result->next(); $result->next();
$row = $result->getRow(); $row = $result->getRow();
$ret = $row['ROL_CODE']; $ret = $row['ROL_CODE'];
return $ret; return $ret;
} }
//Added by Enrique at Feb 9th, 2011 //Added by Enrique at Feb 9th, 2011
//Gets number of users by role //Gets number of users by role
function getAllUsersByRole(){ function getAllUsersByRole(){
@@ -360,7 +360,7 @@ class Roles extends BaseRoles {
} }
return $aRoles; return $aRoles;
} }
//Added by Enrique at Feb 10th, 2011 //Added by Enrique at Feb 10th, 2011
//Gets number of users by department //Gets number of users by department
function getAllUsersByDepartment(){ function getAllUsersByDepartment(){
@@ -378,7 +378,7 @@ class Roles extends BaseRoles {
} }
return $aDepts; return $aDepts;
} }
function getRoleUsers($ROL_UID, $filter='') { function getRoleUsers($ROL_UID, $filter='') {
try { try {
$criteria = new Criteria(); $criteria = new Criteria();
@@ -395,12 +395,12 @@ class Roles extends BaseRoles {
$criteria->addSelectColumn(RbacUsersPeer::USR_LASTNAME); $criteria->addSelectColumn(RbacUsersPeer::USR_LASTNAME);
$criteria->add(RolesPeer::ROL_UID, "", Criteria::NOT_EQUAL); $criteria->add(RolesPeer::ROL_UID, "", Criteria::NOT_EQUAL);
$criteria->add(RolesPeer::ROL_UID, $ROL_UID); $criteria->add(RolesPeer::ROL_UID, $ROL_UID);
$criteria->add(RbacUsersPeer::USR_STATUS, 0, Criteria::NOT_EQUAL); $criteria->add(RbacUsersPeer::USR_STATUS, 0, Criteria::NOT_EQUAL);
$criteria->addJoin(RolesPeer::ROL_UID, UsersRolesPeer::ROL_UID); $criteria->addJoin(RolesPeer::ROL_UID, UsersRolesPeer::ROL_UID);
$criteria->addJoin(UsersRolesPeer::USR_UID, RbacUsersPeer::USR_UID); $criteria->addJoin(UsersRolesPeer::USR_UID, RbacUsersPeer::USR_UID);
if ($filter != ''){ if ($filter != ''){
$criteria->add( $criteria->add(
$criteria->getNewCriterion(RbacUsersPeer::USR_USERNAME,'%'.$filter.'%',Criteria::LIKE)->addOr( $criteria->getNewCriterion(RbacUsersPeer::USR_USERNAME,'%'.$filter.'%',Criteria::LIKE)->addOr(
@@ -408,16 +408,16 @@ class Roles extends BaseRoles {
$criteria->getNewCriterion(RbacUsersPeer::USR_LASTNAME,'%'.$filter.'%',Criteria::LIKE))) $criteria->getNewCriterion(RbacUsersPeer::USR_LASTNAME,'%'.$filter.'%',Criteria::LIKE)))
); );
} }
$oDataset = RolesPeer::doSelectRS($criteria); $oDataset = RolesPeer::doSelectRS($criteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
return $oDataset; return $oDataset;
} catch( exception $e ) { } catch( exception $e ) {
throw $e; throw $e;
} }
} }
function getAllUsers($ROL_UID, $filter='') { function getAllUsers($ROL_UID, $filter='') {
try { try {
$c = new Criteria(); $c = new Criteria();
@@ -425,26 +425,26 @@ class Roles extends BaseRoles {
$c->add(RolesPeer::ROL_UID, $ROL_UID); $c->add(RolesPeer::ROL_UID, $ROL_UID);
$c->addJoin(RolesPeer::ROL_UID, UsersRolesPeer::ROL_UID); $c->addJoin(RolesPeer::ROL_UID, UsersRolesPeer::ROL_UID);
$c->addJoin(UsersRolesPeer::USR_UID, RbacUsersPeer::USR_UID); $c->addJoin(UsersRolesPeer::USR_UID, RbacUsersPeer::USR_UID);
$result = RolesPeer::doSelectRS($c); $result = RolesPeer::doSelectRS($c);
$result->setFetchmode(ResultSet::FETCHMODE_ASSOC); $result->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$result->next(); $result->next();
$a = Array(); $a = Array();
while( $row = $result->getRow() ) { while( $row = $result->getRow() ) {
$a[] = $row['USR_UID']; $a[] = $row['USR_UID'];
$result->next(); $result->next();
} }
$criteria = new Criteria(); $criteria = new Criteria();
$criteria->addSelectColumn(RbacUsersPeer::USR_UID); $criteria->addSelectColumn(RbacUsersPeer::USR_UID);
$criteria->addSelectColumn(RbacUsersPeer::USR_USERNAME); $criteria->addSelectColumn(RbacUsersPeer::USR_USERNAME);
$criteria->addSelectColumn(RbacUsersPeer::USR_FIRSTNAME); $criteria->addSelectColumn(RbacUsersPeer::USR_FIRSTNAME);
$criteria->addSelectColumn(RbacUsersPeer::USR_LASTNAME); $criteria->addSelectColumn(RbacUsersPeer::USR_LASTNAME);
$criteria->add(RbacUsersPeer::USR_STATUS, 1, Criteria::EQUAL); $criteria->add(RbacUsersPeer::USR_STATUS, 1, Criteria::EQUAL);
$criteria->add(RbacUsersPeer::USR_UID, $a, Criteria::NOT_IN); $criteria->add(RbacUsersPeer::USR_UID, $a, Criteria::NOT_IN);
if ($filter != ''){ if ($filter != ''){
$criteria->add( $criteria->add(
$criteria->getNewCriterion(RbacUsersPeer::USR_USERNAME,'%'.$filter.'%',Criteria::LIKE)->addOr( $criteria->getNewCriterion(RbacUsersPeer::USR_USERNAME,'%'.$filter.'%',Criteria::LIKE)->addOr(
@@ -452,7 +452,7 @@ class Roles extends BaseRoles {
$criteria->getNewCriterion(RbacUsersPeer::USR_LASTNAME,'%'.$filter.'%',Criteria::LIKE))) $criteria->getNewCriterion(RbacUsersPeer::USR_LASTNAME,'%'.$filter.'%',Criteria::LIKE)))
); );
} }
$oDataset = RbacUsersPeer::doSelectRS($criteria); $oDataset = RbacUsersPeer::doSelectRS($criteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
return $oDataset; return $oDataset;
@@ -460,7 +460,7 @@ class Roles extends BaseRoles {
throw $e; throw $e;
} }
} }
function assignUserToRole($aData) { function assignUserToRole($aData) {
/*find the system uid for this role */ /*find the system uid for this role */
require_once 'classes/model/Users.php'; require_once 'classes/model/Users.php';
@@ -471,15 +471,15 @@ class Roles extends BaseRoles {
$result->next(); $result->next();
$row = $result->getRow(); $row = $result->getRow();
$sSystemId = $row['ROL_SYSTEM']; $sSystemId = $row['ROL_SYSTEM'];
//updating the role into users table //updating the role into users table
$oCriteria1 = new Criteria('workflow'); $oCriteria1 = new Criteria('workflow');
$oCriteria1->add(UsersPeer::USR_UID , $aData['USR_UID'], Criteria::EQUAL); $oCriteria1->add(UsersPeer::USR_UID , $aData['USR_UID'], Criteria::EQUAL);
$oCriteria2 = new Criteria('workflow'); $oCriteria2 = new Criteria('workflow');
$oCriteria2->add(UsersPeer::USR_ROLE , $row['ROL_CODE']); $oCriteria2->add(UsersPeer::USR_ROLE , $row['ROL_CODE']);
BasePeer::doUpdate($oCriteria1, $oCriteria2, Propel::getConnection('workflow')); BasePeer::doUpdate($oCriteria1, $oCriteria2, Propel::getConnection('workflow'));
//delete roles for the same System //delete roles for the same System
$c = new Criteria(); $c = new Criteria();
$c->addSelectColumn(UsersRolesPeer::USR_UID); $c->addSelectColumn(UsersRolesPeer::USR_UID);
$c->addSelectColumn(RolesPeer::ROL_UID); $c->addSelectColumn(RolesPeer::ROL_UID);
@@ -491,7 +491,7 @@ class Roles extends BaseRoles {
$result = RolesPeer::doSelectRS($c); $result = RolesPeer::doSelectRS($c);
$result->setFetchmode(ResultSet::FETCHMODE_ASSOC); $result->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$result->next(); $result->next();
while( $row = $result->getRow() ) { while( $row = $result->getRow() ) {
$crit = new Criteria(); $crit = new Criteria();
$crit->add(UsersRolesPeer::USR_UID, $row['USR_UID']); $crit->add(UsersRolesPeer::USR_UID, $row['USR_UID']);
@@ -499,26 +499,26 @@ class Roles extends BaseRoles {
UsersRolesPeer::doDelete($crit); UsersRolesPeer::doDelete($crit);
$result->next(); $result->next();
} }
//save the unique role for this system //save the unique role for this system
$oUsersRoles = new UsersRoles(); $oUsersRoles = new UsersRoles();
$oUsersRoles->setUsrUid($aData['USR_UID']); $oUsersRoles->setUsrUid($aData['USR_UID']);
$oUsersRoles->setRolUid($aData['ROL_UID']); $oUsersRoles->setRolUid($aData['ROL_UID']);
$oUsersRoles->save(); $oUsersRoles->save();
} }
function deleteUserRole($ROL_UID, $USR_UID) { function deleteUserRole($ROL_UID, $USR_UID) {
$crit = new Criteria(); $crit = new Criteria();
$crit->add(UsersRolesPeer::USR_UID, $USR_UID); $crit->add(UsersRolesPeer::USR_UID, $USR_UID);
if ($ROL_UID != '%') { if ($ROL_UID != '%') {
$crit->add(UsersRolesPeer::ROL_UID, $ROL_UID); $crit->add(UsersRolesPeer::ROL_UID, $ROL_UID);
} }
UsersRolesPeer::doDelete($crit); UsersRolesPeer::doDelete($crit);
} }
function getRolePermissions($ROL_UID, $filter='') { function getRolePermissions($ROL_UID, $filter='', $status=null) {
try { try {
$criteria = new Criteria(); $criteria = new Criteria();
$criteria->addSelectColumn(RolesPeer::ROL_UID); $criteria->addSelectColumn(RolesPeer::ROL_UID);
@@ -537,38 +537,42 @@ class Roles extends BaseRoles {
$criteria->add(RolesPeer::ROL_UID, $ROL_UID); $criteria->add(RolesPeer::ROL_UID, $ROL_UID);
$criteria->addJoin(RolesPeer::ROL_UID, RolesPermissionsPeer::ROL_UID); $criteria->addJoin(RolesPeer::ROL_UID, RolesPermissionsPeer::ROL_UID);
$criteria->addJoin(RolesPermissionsPeer::PER_UID, PermissionsPeer::PER_UID); $criteria->addJoin(RolesPermissionsPeer::PER_UID, PermissionsPeer::PER_UID);
if ($filter != ''){ if ($filter != '') {
$criteria->add(PermissionsPeer::PER_CODE, '%'.$filter.'%',Criteria::LIKE); $criteria->add(PermissionsPeer::PER_CODE, '%'.$filter.'%',Criteria::LIKE);
} }
if (!is_null($status) && ($status == 1 || $status == 0)) {
$criteria->add(PermissionsPeer::PER_STATUS, $status);
}
$oDataset = RolesPeer::doSelectRS($criteria); $oDataset = RolesPeer::doSelectRS($criteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
return $oDataset; return $oDataset;
} catch( exception $e ) { } catch( exception $e ) {
throw $e; throw $e;
} }
} }
function getAllPermissions($ROL_UID, $PER_SYSTEM = "", $filter='') { function getAllPermissions($ROL_UID, $PER_SYSTEM = "", $filter='', $status=null) {
try { try {
$c = new Criteria(); $c = new Criteria();
$c->addSelectColumn(PermissionsPeer::PER_UID); $c->addSelectColumn(PermissionsPeer::PER_UID);
$c->add(RolesPeer::ROL_UID, $ROL_UID); $c->add(RolesPeer::ROL_UID, $ROL_UID);
$c->addJoin(RolesPeer::ROL_UID, RolesPermissionsPeer::ROL_UID); $c->addJoin(RolesPeer::ROL_UID, RolesPermissionsPeer::ROL_UID);
$c->addJoin(RolesPermissionsPeer::PER_UID, PermissionsPeer::PER_UID); $c->addJoin(RolesPermissionsPeer::PER_UID, PermissionsPeer::PER_UID);
$result = PermissionsPeer::doSelectRS($c); $result = PermissionsPeer::doSelectRS($c);
$result->setFetchmode(ResultSet::FETCHMODE_ASSOC); $result->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$result->next(); $result->next();
$a = Array(); $a = Array();
while( $row = $result->getRow() ) { while( $row = $result->getRow() ) {
$a[] = $row['PER_UID']; $a[] = $row['PER_UID'];
$result->next(); $result->next();
} }
$criteria = new Criteria(); $criteria = new Criteria();
$criteria->addSelectColumn(PermissionsPeer::PER_UID); $criteria->addSelectColumn(PermissionsPeer::PER_UID);
$criteria->addSelectColumn(PermissionsPeer::PER_CODE); $criteria->addSelectColumn(PermissionsPeer::PER_CODE);
@@ -582,11 +586,15 @@ class Roles extends BaseRoles {
$criteria->add(SystemsPeer::SYS_CODE, $PER_SYSTEM); $criteria->add(SystemsPeer::SYS_CODE, $PER_SYSTEM);
} }
$criteria->addJoin(PermissionsPeer::PER_SYSTEM, SystemsPeer::SYS_UID); $criteria->addJoin(PermissionsPeer::PER_SYSTEM, SystemsPeer::SYS_UID);
if ($filter != ''){ if ($filter != ''){
$criteria->add(PermissionsPeer::PER_CODE, '%'.$filter.'%',Criteria::LIKE); $criteria->add(PermissionsPeer::PER_CODE, '%'.$filter.'%',Criteria::LIKE);
} }
if (!is_null($status) && ($status == 1 || $status == 0)) {
$criteria->add(PermissionsPeer::PER_STATUS, $status);
}
$oDataset = PermissionsPeer::doSelectRS($criteria); $oDataset = PermissionsPeer::doSelectRS($criteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
return $oDataset; return $oDataset;
@@ -594,21 +602,21 @@ class Roles extends BaseRoles {
throw $e; throw $e;
} }
} }
function assignPermissionRole($sData) { function assignPermissionRole($sData) {
$o = new RolesPermissions(); $o = new RolesPermissions();
$o->setPerUid($sData['PER_UID']); $o->setPerUid($sData['PER_UID']);
$o->setRolUid($sData['ROL_UID']); $o->setRolUid($sData['ROL_UID']);
$o->save(); $o->save();
} }
function deletePermissionRole($ROL_UID, $PER_UID) { function deletePermissionRole($ROL_UID, $PER_UID) {
$crit = new Criteria(); $crit = new Criteria();
$crit->add(RolesPermissionsPeer::ROL_UID, $ROL_UID); $crit->add(RolesPermissionsPeer::ROL_UID, $ROL_UID);
$crit->add(RolesPermissionsPeer::PER_UID, $PER_UID); $crit->add(RolesPermissionsPeer::PER_UID, $PER_UID);
RolesPermissionsPeer::doDelete($crit); RolesPermissionsPeer::doDelete($crit);
} }
function numUsersWithRole($ROL_UID) { function numUsersWithRole($ROL_UID) {
$criteria = new Criteria(); $criteria = new Criteria();
$criteria->addSelectColumn(RbacUsersPeer::USR_UID); $criteria->addSelectColumn(RbacUsersPeer::USR_UID);
@@ -616,10 +624,10 @@ class Roles extends BaseRoles {
$criteria->add(RolesPeer::ROL_UID, $ROL_UID); $criteria->add(RolesPeer::ROL_UID, $ROL_UID);
$criteria->addJoin(RolesPeer::ROL_UID, UsersRolesPeer::ROL_UID); $criteria->addJoin(RolesPeer::ROL_UID, UsersRolesPeer::ROL_UID);
$criteria->addJoin(UsersRolesPeer::USR_UID, RbacUsersPeer::USR_UID); $criteria->addJoin(UsersRolesPeer::USR_UID, RbacUsersPeer::USR_UID);
return RolesPeer::doCount($criteria); return RolesPeer::doCount($criteria);
} }
function verifyByCode($sRolCode = '') { function verifyByCode($sRolCode = '') {
try { try {
$oCriteria = new Criteria('rbac'); $oCriteria = new Criteria('rbac');
@@ -637,7 +645,7 @@ class Roles extends BaseRoles {
throw ($oError); throw ($oError);
} }
} }
public function getRolName() { public function getRolName() {
if ($this->getRolUid() == '') { if ($this->getRolUid() == '') {
throw (new Exception("Error in getRolName, the ROL_UID can't be blank")); throw (new Exception("Error in getRolName, the ROL_UID can't be blank"));
@@ -646,7 +654,7 @@ class Roles extends BaseRoles {
$this->rol_name = Content::load('ROL_NAME', '', $this->getRolUid(), $lang); $this->rol_name = Content::load('ROL_NAME', '', $this->getRolUid(), $lang);
return $this->rol_name; return $this->rol_name;
} }
public function setRolName($v) { public function setRolName($v) {
if ($this->getRolUid() == '') { if ($this->getRolUid() == '') {
throw (new Exception("Error in setProTitle, the PRO_UID can't be blank")); throw (new Exception("Error in setProTitle, the PRO_UID can't be blank"));
@@ -656,12 +664,12 @@ class Roles extends BaseRoles {
if ($v !== null && ! is_string($v)) { if ($v !== null && ! is_string($v)) {
$v = (string)$v; $v = (string)$v;
} }
if ($this->rol_name !== $v || $v === '') { if ($this->rol_name !== $v || $v === '') {
$this->rol_name = $v; $this->rol_name = $v;
$lang = defined('SYS_LANG') ? SYS_LANG : 'en'; $lang = defined('SYS_LANG') ? SYS_LANG : 'en';
$res = Content::addContent('ROL_NAME', '', $this->getRolUid(), $lang, $this->rol_name); $res = Content::addContent('ROL_NAME', '', $this->getRolUid(), $lang, $this->rol_name);
} }
} }
} // Roles } // Roles

4
workflow/engine/methods/roles/data_rolesPermissions.php
View File

@@ -35,8 +35,8 @@ if ($RBAC->permissionsObj->loadByCode('PM_CANCELCASE') === false) {
$RBAC->permissionsObj->create(array('PER_CODE' => 'PM_CANCELCASE', 'PER_CREATE_DATE' => date('Y-m-d H:i:s'))); $RBAC->permissionsObj->create(array('PER_CODE' => 'PM_CANCELCASE', 'PER_CREATE_DATE' => date('Y-m-d H:i:s')));
} }
if ($TYPE_DATA=='list') $oDataset = $RBAC->getRolePermissions($ROL_UID,$filter); if ($TYPE_DATA=='list') $oDataset = $RBAC->getRolePermissions($ROL_UID, $filter, 1);
if ($TYPE_DATA=='show') $oDataset = $RBAC->getAllPermissions($ROL_UID,$RBAC->sSystem,$filter); if ($TYPE_DATA=='show') $oDataset = $RBAC->getAllPermissions($ROL_UID, $RBAC->sSystem, $filter, 1);
$rows = Array(); $rows = Array();
while($oDataset->next()){ while($oDataset->next()){