Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 303784: Visibility can keep admin from administering groups - Patch by Joel Peshkin <bugreport@peshkin.net> r=LpSolit a=justdave

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@180935 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
lpsolit%gmail.com 2005-09-25 20:54:39 +00:00
parent bc1b078e3c
commit 848bc100ea
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/webtools/bugzilla/Bugzilla/User.pm
View File

@ -328,7 +328,7 @@ sub bless_groups {
}
# If visibilitygroups are used, restrict the set of groups.
if (Param('usevisibilitygroups')) {
if ((!$self->in_group('editusers')) && Param('usevisibilitygroups')) {
# Users need to see a group in order to bless it.
my $visibleGroups = join(', ', @{$self->visible_groups_direct()})
|| return $self->{'bless_groups'} = [];

15
mozilla/webtools/bugzilla/editusers.cgi
View File

@ -85,7 +85,7 @@ if ($action eq 'search') {
my $nextCondition;
my $visibleGroups;
if (Param('usevisibilitygroups')) {
if (!$editusers && Param('usevisibilitygroups')) {
# Show only users in visible groups.
$visibleGroups = $user->visible_groups_as_string();
@ -233,7 +233,7 @@ if ($action eq 'search') {
'group_group_map READ',
'group_group_map AS ggm READ');
$user->can_see_user($otherUser)
$editusers || $user->can_see_user($otherUser)
|| ThrowUserError('auth_failure', {reason => "not_visible",
action => "modify",
object => "user"});
@ -409,11 +409,6 @@ if ($action eq 'search') {
$editusers || ThrowUserError('auth_failure', {group => "editusers",
action => "delete",
object => "users"});
$user->can_see_user($otherUser)
|| ThrowUserError('auth_failure', {reason => "not_visible",
action => "delete",
object => "user"});
$vars->{'otheruser'} = $otherUser;
$vars->{'editcomponents'} = UserInGroup('editcomponents');
@ -519,10 +514,6 @@ if ($action eq 'search') {
{group => "editusers",
action => "delete",
object => "users"});
$user->can_see_user($otherUser)
|| ThrowUserError('auth_failure', {reason => "not_visible",
action => "delete",
object => "user"});
@{$otherUser->product_responsibilities()}
&& ThrowUserError('user_has_responsibility');
@ -785,7 +776,7 @@ sub edit_processing
$otherUser
|| ThrowCodeError('invalid_user_id', {'userid' => $cgi->param('userid')});
$user->can_see_user($otherUser)
$editusers || $user->can_see_user($otherUser)
|| ThrowUserError('auth_failure', {reason => "not_visible",
action => "modify",
object => "user"});