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

this bug 5867 was solved, you can change the status in a role and if this role is inactive it doesnt appear in user edit

Browse Source
This commit is contained in:
Carlos Pacha
2011-01-13 20:20:49 +00:00
parent 805a34651d
commit 8cd9ccdf56
5 changed files with 38 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
workflow/engine/methods/roles/roles_Ajax.php
View File

@@ -114,8 +114,37 @@ switch ($REQUEST) {
break;
case 'updateDataRole':
$response = ($RBAC->verifyNewRole($_GET['code']))?'true':'false';
print($response);
require_once 'classes/model/om/BaseRoles.php';
require_once 'classes/model/Content.php';
$oCriteria = new Criteria('rbac');
$oCriteria->addSelectColumn(RolesPeer::ROL_UID);
$oCriteria->addSelectColumn(RolesPeer::ROL_PARENT);
$oCriteria->addSelectColumn(RolesPeer::ROL_SYSTEM);
$oCriteria->addSelectColumn(RolesPeer::ROL_CODE);
$oCriteria->addSelectColumn(RolesPeer::ROL_CREATE_DATE);
$oCriteria->addSelectColumn(RolesPeer::ROL_UPDATE_DATE);
$oCriteria->addSelectColumn(RolesPeer::ROL_STATUS);
$oCriteria->add(RolesPeer::ROL_CODE, $_GET['code']);
$result = RolesPeer::doSelectRS($oCriteria);
$result->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$result->next();
$row = $result->getRow();
$oCriteria1 = new Criteria('workflow');
$oCriteria1->add(ContentPeer::CON_CATEGORY, 'ROL_NAME');
$oCriteria1->add(ContentPeer::CON_ID, $row['ROL_UID']);
$oCriteria1->add(ContentPeer::CON_LANG, SYS_LANG);
$oDataset1 = ContentPeer::doSelectRS($oCriteria1);
$oDataset1->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset1->next();
$aRow1 = $oDataset1->getRow();
$row['ROL_NAME'] = $aRow1['CON_VALUE'];
$row['ROL_UPDATE_DATE'] = date("Y-M-d H:i:s");
$RBAC->updateRole($row);
//$response = ($RBAC->verifyNewRole($_GET['code']))?'true':'false';
break;
case 'usersIntoRole':

4
workflow/engine/xmlform/roles/roles_Edit.xml
View File

@@ -17,7 +17,7 @@
</ROL_NAME>
<ROL_STATUS type="dropdown" size="25" maxlength="32" defaultvalue="Active">
<en>Status<option name="1">Active</option><option name="">Inactive</option></en>
<en>Status<option name="1">Active</option><option name="0">Inactive</option></en>
</ROL_STATUS>
<BTN_CANCEL type="button" onclick="cancel()">
@@ -35,4 +35,4 @@ function cancel(){
]]></JS>
</dynaForm>
</dynaForm>

4
workflow/engine/xmlform/roles/roles_Options.xml
View File

@@ -20,7 +20,7 @@ PROCESS_REQUEST_FILE = '../roles/roles_Ajax';
PROCESS_REQUEST_FILE_USER = '../roles/roles_AddUser';
function newRol() {
popupWindow('', '../roles/roles_Ajax?request=newRole', 350, 225);
popupWindow('', '../roles/roles_Ajax?request=newRole', 350, 265);
}
@@ -86,7 +86,7 @@ function editRole(ROL_UID)
if(ROL_UID!='00000000000000000000000000000002')
{
var uri = 'request=editRole&ROL_UID='+ROL_UID;
popupWindow('', '../roles/roles_Ajax?'+uri, 350, 225);
popupWindow('', '../roles/roles_Ajax?'+uri, 350, 265);
}
else
{

4
workflow/engine/xmlform/users/users_EditRT.xml
View File

@@ -112,7 +112,7 @@
</USR_STATUS>
<USR_ROLE type="dropdown" defaultvalue="" required="0" group="1" dependentfields="" readonly="0" sqlconnection="rbac" noshowingrid="0" readonlyingrid="0"><![CDATA[
SELECT ROL_CODE AS USR_ROLE, ROL_CODE AS CODE FROM ROLES WHERE ROL_SYSTEM = '00000000000000000000000000000002' ORDER BY ROL_CODE
SELECT ROL_CODE AS USR_ROLE, ROL_CODE AS CODE FROM ROLES WHERE ROL_SYSTEM = '00000000000000000000000000000002' AND ROL_STATUS = 1 ORDER BY ROL_CODE
]]><en>Role</en>
</USR_ROLE>
@@ -279,4 +279,4 @@
]]></JS>
</dynaForm>
</dynaForm>

2
workflow/engine/xmlform/users/users_New.xml
View File

@@ -105,7 +105,7 @@ SELECT CALENDAR_UID, CALENDAR_NAME FROM availableCalendars
</USR_STATUS>
<USR_ROLE type="dropdown" defaultvalue="" required="0" group="1" dependentfields="" readonly="0" sqlconnection="rbac" noshowingrid="0" readonlyingrid="0">
SELECT ROL_CODE AS USR_ROLE, ROL_CODE AS CODE FROM ROLES WHERE ROL_SYSTEM = '00000000000000000000000000000002' ORDER BY FIELD(ROL_CODE,'@#DEFAULT_ROLE') DESC
SELECT ROL_CODE AS USR_ROLE, ROL_CODE AS CODE FROM ROLES WHERE ROL_SYSTEM = '00000000000000000000000000000002' AND ROL_STATUS = 1 ORDER BY FIELD(ROL_CODE,'@#DEFAULT_ROLE') DESC
<en>Role</en>
</USR_ROLE>