Skip to content
This repository has been archived by the owner on Jul 6, 2020. It is now read-only.

FIT-1581 - making sure correct user roles can edit/see other roles #333

Merged
merged 10 commits into from
Apr 8, 2016
Merged

FIT-1581 - making sure correct user roles can edit/see other roles #333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
08e970c
making sure correct user roles can edit/see other roles
Mar 8, 2016
7e32886
pesky newline
Mar 8, 2016
ec33330
adding more targeting to views_pre_render hook
Mar 21, 2016
b5d4642
making permissions check with role ids more robust
Mar 21, 2016
503659d
adding administrator role to be ingored for filtering on people overv…
Mar 21, 2016
ee11b44
fixing merge conflict
Mar 28, 2016
c407df8
changing role permissions to use role name placeholders
Mar 28, 2016
89f7360
Merge branch 'dev' into feature/FIT-1581
Apr 6, 2016
2f598c9
fixing the commit that reverted some changes FIT-1581
kevincrafts Apr 6, 2016
c37fce4
making super user able to see all users on overview page
Apr 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions modules/custom/cu_users/cu_users.module
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,26 @@ function cu_users_user_has_role($role_name, $user = NULL) {
return FALSE;
}

/**
* Implements hook_views_pre_render().
*
* Hide developers and administrators on the Users overview page from lesser roles.
*/
function cu_users_views_pre_render(&$view) {
if ($view->name == 'cu_people_administration_override_view') {
global $user;
if (in_array('developer', $user->roles) || in_array('administrator', $user->roles) || $user->uid == 1) {
return;
}
foreach ($view->result as $key => $user) {
$user_object = user_load($user->uid);
if (in_array('developer', $user_object->roles) || in_array('administrator', $user_object->roles)) {
unset($view->result[$key]);
}
}
}
}

/**
* Implements hook_form_FORM_ID_alter().
*
Expand Down
26 changes: 17 additions & 9 deletions modules/custom/express_permissions/express_permissions.module
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ function express_permissions_secure_permissions_roles() {
* An array defining all the permissions for the site.
*/
function express_permissions_secure_permissions($role) {
$permissions = array(
$permissions = array(
'administrator' => array(
'access administration pages',
'access bean overview',
Expand All @@ -64,8 +64,10 @@ function express_permissions_secure_permissions($role) {
'assign content_editor role',
'assign edit_my_content role',
'assign site_owner role',
'cancel users with role 2',
'cancel users with role 6',
'cancel users with role authenticated user',
'cancel users with role content_editor',
'cancel users with role edit_my_content',
'cancel users with role site_owner',
'check out documents',
'create any block bean',
'create any feature_callout bean',
Expand Down Expand Up @@ -96,8 +98,10 @@ function express_permissions_secure_permissions($role) {
'edit own faqs content',
'edit own file content',
'edit own page content',
'edit users with role 2',
'edit users with role 6',
'edit users with role authenticated user',
'edit users with role content_editor',
'edit users with role edit_my_content',
'edit users with role site_owner',
'execute node_assign_owner_action',
'execute node_make_sticky_action',
'execute node_make_unsticky_action',
Expand Down Expand Up @@ -416,8 +420,10 @@ function express_permissions_secure_permissions($role) {
'assign content_editor role',
'assign edit_my_content role',
'assign site_owner role',
'cancel users with role 2',
'cancel users with role 6',
'cancel users with role authenticated user',
'cancel users with role content_editor',
'cancel users with role edit_my_content',
'cancel users with role site_owner',
'check out documents',
'create any block bean',
'create any feature_callout bean',
Expand Down Expand Up @@ -448,8 +454,10 @@ function express_permissions_secure_permissions($role) {
'edit own faqs content',
'edit own file content',
'edit own page content',
'edit users with role 2',
'edit users with role 6',
'edit users with role authenticated user',
'edit users with role content_editor',
'edit users with role edit_my_content',
'edit users with role site_owner',
'execute node_assign_owner_action',
'execute node_make_sticky_action',
'execute node_make_unsticky_action',
Expand Down