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

Reponiendo cambios en la clase Role

Browse Source
This commit is contained in:
Julio Cesar Laura
2014-09-05 09:56:47 -04:00
parent 3ffdfcbad3
commit cd0cdb4296
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,7 +64,7 @@ class Roles extends BaseRoles {
$this->setNew(false); $this->setNew(false);
$this->getRolName(); $this->getRolName();
$aFields['ROL_NAME'] = $this->rol_name; $aFields['ROL_NAME'] = ($this->rol_name != '' ? $this->rol_name: $this->getRolCode());
return $aFields; return $aFields;
} else { } else {
@@ -83,11 +83,14 @@ class Roles extends BaseRoles {
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset->next(); $oDataset->next();
$aRow = $oDataset->getRow(); $aRow = $oDataset->getRow();
$roles = new Roles(); $roles = new Roles();
$roles->load($aRow['ROL_UID']); $roles->load($aRow['ROL_UID']);
$aRow['ROL_NAME'] = $roles->getRolName(); $aRow['ROL_NAME'] = $roles->getRolName();
if ($aRow['ROL_NAME'] == '') {
$aRow['ROL_NAME'] = $roles->getRolCode();
}
if (is_array($aRow)) { if (is_array($aRow)) {
return $aRow; return $aRow;
} else { } else {
@@ -159,16 +162,16 @@ 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;
} }
@@ -183,6 +186,9 @@ class Roles extends BaseRoles {
$o = new Roles(); $o = new Roles();
$o->load($row['ROL_UID']); $o->load($row['ROL_UID']);
$row['ROL_NAME'] = $o->getRolName(); $row['ROL_NAME'] = $o->getRolName();
if ($row['ROL_NAME'] == '') {
$row['ROL_NAME'] = $o->getRolCode();
}
$aRows[] = $row; $aRows[] = $row;
} }
return $aRows; return $aRows;
@@ -320,6 +326,9 @@ class Roles extends BaseRoles {
if (is_array($row)) { if (is_array($row)) {
$o = RolesPeer::retrieveByPK($row['ROL_UID']); $o = RolesPeer::retrieveByPK($row['ROL_UID']);
$row['ROL_NAME'] = $o->getRolName(); $row['ROL_NAME'] = $o->getRolName();
if ($row['ROL_NAME'] == '') {
$row['ROL_NAME'] = $o->getRolCode();
}
return $row; return $row;
} else { } else {
return null; return null;