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

BUG 6505 "Users with the "PM_USERS" permission..." Solved!

Browse Source 
- completing validations
- ADMIN->Users now enabled for PM_USERS permission
This commit is contained in:
Erik Amaru Ortiz
2011-08-09 17:07:51 -04:00
parent 7a152675f8
commit 51250622a1
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
workflow/engine/menus/setup.php
View File

@@ -72,5 +72,8 @@ if ($RBAC->userCanAccess('PM_SETUP') == 1 || $RBAC->userCanAccess('PM_USERS') ==
$G_TMP_MENU->AddIdRawOption('GROUPS', '../groups/groups', G::LoadTranslation('ID_GROUPS'), '', '', 'users'); $G_TMP_MENU->AddIdRawOption('GROUPS', '../groups/groups', G::LoadTranslation('ID_GROUPS'), '', '', 'users');
$G_TMP_MENU->AddIdRawOption('DEPARTAMENTS', '../departments/departments', G::LoadTranslation('ID_DEPARTMENTS_USERS'), '', '', 'users'); $G_TMP_MENU->AddIdRawOption('DEPARTAMENTS', '../departments/departments', G::LoadTranslation('ID_DEPARTMENTS_USERS'), '', '', 'users');
$G_TMP_MENU->AddIdRawOption('ROLES', '../roles/roles_List', G::LoadTranslation('ID_ROLES'), '', '', 'users'); $G_TMP_MENU->AddIdRawOption('ROLES', '../roles/roles_List', G::LoadTranslation('ID_ROLES'), '', '', 'users');
}
if ($RBAC->userCanAccess('PM_SETUP_ADVANCE') == 1) {
$G_TMP_MENU->AddIdRawOption('AUTHSOURCES', '../authSources/authSources_List', G::LoadTranslation('ID_AUTH_SOURCES'), '', '', 'users'); $G_TMP_MENU->AddIdRawOption('AUTHSOURCES', '../authSources/authSources_List', G::LoadTranslation('ID_AUTH_SOURCES'), '', '', 'users');
} }

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

@@ -88,4 +88,6 @@ $oHeadPublisher->addExtJsScript('users/usersGroups', false); //adding a javas
$oHeadPublisher->addContent('users/usersGroups'); //adding a html file .html. $oHeadPublisher->addContent('users/usersGroups'); //adding a html file .html.
$oHeadPublisher->assign('USERS', $users); $oHeadPublisher->assign('USERS', $users);
$oHeadPublisher->assign('hasAuthPerm', ($RBAC->userCanAccess('PM_SETUP_ADVANCE') == 1));
G::RenderPage('publish', 'extJs'); G::RenderPage('publish', 'extJs');

13
workflow/engine/templates/users/usersGroups.js
View File

@@ -422,10 +422,9 @@ Ext.onReady(function(){
}); });
//TABS PANEL //TABS PANEL
tabsPanel = new Ext.TabPanel({ tabsPanelConfig = {
region: 'center', region: 'center',
activeTab: USERS.CURRENT_TAB, activeTab: USERS.CURRENT_TAB,
items:[SummaryPanel,GroupsPanel,AuthenticationPanel],
listeners:{ listeners:{
beforetabchange: function(p,t,c){ beforetabchange: function(p,t,c){
switch(t.title){ switch(t.title){
@@ -470,7 +469,15 @@ Ext.onReady(function(){
} }
} }
} }
}); }
tabsPanelConfig.items = new Array();
tabsPanelConfig.items.push(SummaryPanel);
tabsPanelConfig.items.push(GroupsPanel);
if (typeof hasAuthPerm != 'undefined' && hasAuthPerm) {
tabsPanelConfig.items.push(AuthenticationPanel);
}
tabsPanel = new Ext.TabPanel(tabsPanelConfig);
//LOAD ALL PANELS //LOAD ALL PANELS
viewport = new Ext.Viewport({ viewport = new Ext.Viewport({