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

Merged in julceslau/processmaker (pull request #734)

Browse Source 
BUG 15670 Validate the Role Name from the web and Plugins Creation SOLVED
This commit is contained in:
Julio Cesar Laura Avendaño
2014-09-02 12:11:53 -04:00
parent 66d38085f2 c6d601cf68
commit 2e8d6796a4
2 changed files with 17 additions and 8 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->getRolName();
$aFields['ROL_NAME'] = $this->rol_name;
$aFields['ROL_NAME'] = ($this->rol_name != '' ? $this->rol_name: $this->getRolCode());
return $aFields;
} else {
@@ -83,11 +83,14 @@ class Roles extends BaseRoles {
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset->next();
$aRow = $oDataset->getRow();
$roles = new Roles();
$roles->load($aRow['ROL_UID']);
$aRow['ROL_NAME'] = $roles->getRolName();
if ($aRow['ROL_NAME'] == '') {
$aRow['ROL_NAME'] = $roles->getRolCode();
}
if (is_array($aRow)) {
return $aRow;
} else {
@@ -159,16 +162,16 @@ class Roles extends BaseRoles {
$oCriteria->add(RolesPeer::ROL_CREATE_DATE, '', Criteria::NOT_EQUAL);
$oCriteria->add(RolesPeer::ROL_UPDATE_DATE, '', Criteria::NOT_EQUAL);
$oCriteria->addJoin(RolesPeer::ROL_SYSTEM, SystemsPeer::SYS_UID);
if ($filter != '') {
$oCriteria->add(RolesPeer::ROL_CODE, '%'.$filter.'%', Criteria::LIKE);
}
$oCriteria->setOffset($start);
$oCriteria->setLimit($limit);
$result['LIST'] = $oCriteria;
return $result;
}
@@ -183,6 +186,9 @@ class Roles extends BaseRoles {
$o = new Roles();
$o->load($row['ROL_UID']);
$row['ROL_NAME'] = $o->getRolName();
if ($row['ROL_NAME'] == '') {
$row['ROL_NAME'] = $o->getRolCode();
}
$aRows[] = $row;
}
return $aRows;
@@ -320,6 +326,9 @@ class Roles extends BaseRoles {
if (is_array($row)) {
$o = RolesPeer::retrieveByPK($row['ROL_UID']);
$row['ROL_NAME'] = $o->getRolName();
if ($row['ROL_NAME'] == '') {
$row['ROL_NAME'] = $o->getRolCode();
}
return $row;
} else {
return null;

2
workflow/engine/methods/users/users_Ajax.php
View File

@@ -456,7 +456,7 @@ try {
}
$row['USR_ROLE_ID'] = $row['USR_ROLE'];
$row['USR_ROLE'] = isset($uRole['ROL_NAME']) ? ($uRole['ROL_NAME'] != '' ? $uRole['ROL_NAME'] : $uRole['USR_ROLE']) : $uRole['USR_ROLE'];
$row['USR_ROLE'] = isset($uRole['ROL_NAME']) ? ($uRole['ROL_NAME'] != '' ? $uRole['ROL_NAME'] : $uRole['ROL_CODE']) : $uRole['ROL_CODE'];
$row['DUE_DATE_OK'] = (date('Y-m-d') > date('Y-m-d', strtotime($row['USR_DUE_DATE']))) ? 0 : 1;
$row['LAST_LOGIN'] = isset($aLogin[$row['USR_UID']]) ? $aLogin[$row['USR_UID']] : '';