Commit 3d7ec6cf authored by Leigh B. Stoller's avatar Leigh B. Stoller
Browse files

Fix bug in AccessCheck() for editing groups.

parent eb813655
...@@ -407,7 +407,6 @@ sub EditGroup($$$$) ...@@ -407,7 +407,6 @@ sub EditGroup($$$$)
# #
# First pass does checks. Second pass does the real thing. # First pass does checks. Second pass does the real thing.
# #
my $g_pid = $group->pid(); my $g_pid = $group->pid();
my $g_gid = $group->gid(); my $g_gid = $group->gid();
my $target_user; my $target_user;
...@@ -487,7 +486,7 @@ sub EditGroup($$$$) ...@@ -487,7 +486,7 @@ sub EditGroup($$$$)
foreach $target_user (@nonmembers) { foreach $target_user (@nonmembers) {
$target_uid = $target_user->uid(); $target_uid = $target_user->uid();
$target_idx = $target_user->uid_idx(); $target_idx = $target_user->uid_idx();
$foo = "add_$target_idx"; $foo = "add_$target_idx";
if (exists($argref->{$foo}) && $argref->{$foo} eq "permit"){ if (exists($argref->{$foo}) && $argref->{$foo} eq "permit"){
# #
...@@ -785,7 +784,9 @@ sub AccessCheck($$$) ...@@ -785,7 +784,9 @@ sub AccessCheck($$$)
# Only project_root or group_root in default group # Only project_root or group_root in default group
# may grab (involuntarily add) users into groups. # may grab (involuntarily add) users into groups.
# #
$gid = $pid; if (! $self->IsProjectGroup()) {
return $self->GetProject()->AccessCheck($user, $access_type);
}
$mintrust = PROJMEMBERTRUST_GROUPROOT; $mintrust = PROJMEMBERTRUST_GROUPROOT;
} }
elsif ($access_type == TB_PROJECT_DELUSER) { elsif ($access_type == TB_PROJECT_DELUSER) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment