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

Bug 323955: Deleting a group incorrectly checks for user group membership (miss group inheritance) - Patch by Frédéric Buclin <LpSolit@gmail.com> r=joel a=justdave

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@187966 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
lpsolit%gmail.com
2006-01-21 13:48:56 +00:00
parent 0278de6ec7
commit f9d60a3911
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mozilla/webtools/bugzilla/editgroups.cgi
View File

@@ -32,6 +32,7 @@ use lib ".";
use Bugzilla;
use Bugzilla::Constants;
use Bugzilla::Group;
use Bugzilla::User;
require "globals.pl";
my $cgi = Bugzilla->cgi;
@@ -338,10 +339,12 @@ if ($action eq 'del') {
ThrowUserError("system_group_not_deletable", { name => $name });
}
my $hasusers = $dbh->selectrow_array('SELECT 1 FROM user_group_map
WHERE group_id = ? AND isbless = 0 ' .
$dbh->sql_limit(1),
undef, $gid) || 0;
# Group inheritance no longer appears in user_group_map.
my $grouplist = join(',', @{Bugzilla::User->flatten_group_membership($gid)});
my $hasusers =
$dbh->selectrow_array("SELECT 1 FROM user_group_map
WHERE group_id IN ($grouplist) AND isbless = 0 " .
$dbh->sql_limit(1)) || 0;
my $bug_ids = $dbh->selectcol_arrayref('SELECT bug_id FROM bug_group_map
WHERE group_id = ?', undef, $gid);
@@ -391,10 +394,13 @@ if ($action eq 'delete') {
my $cantdelete = 0;
my $hasusers = $dbh->selectrow_array('SELECT 1 FROM user_group_map
WHERE group_id = ? AND isbless = 0 ' .
$dbh->sql_limit(1),
undef, $gid) || 0;
# Group inheritance no longer appears in user_group_map.
my $grouplist = join(',', @{Bugzilla::User->flatten_group_membership($gid)});
my $hasusers =
$dbh->selectrow_array("SELECT 1 FROM user_group_map
WHERE group_id IN ($grouplist) AND isbless = 0 " .
$dbh->sql_limit(1)) || 0;
if ($hasusers && !defined $cgi->param('removeusers')) {
$cantdelete = 1;
}