mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-10 20:05:49 +00:00
Bug 322082: Clean up user selection SQL.
Patch by Marc Schumann <wurblzap@gmail.com>, r=LpSolit, a=justdave
This commit is contained in:
parent
2170b6ff99
commit
70513f26f3
@ -100,9 +100,15 @@ if ($action eq 'search') {
|
||||
} else {
|
||||
$visibleGroups = 1;
|
||||
if ($grouprestrict eq '1') {
|
||||
$query .= ', user_group_map AS ugm';
|
||||
$query .= qq{, user_group_map AS ugm
|
||||
WHERE ugm.user_id = profiles.userid
|
||||
AND ugm.isbless = 0
|
||||
};
|
||||
$nextCondition = 'AND';
|
||||
}
|
||||
else {
|
||||
$nextCondition = 'WHERE';
|
||||
}
|
||||
$nextCondition = 'WHERE';
|
||||
}
|
||||
|
||||
if (!$visibleGroups) {
|
||||
@ -137,9 +143,7 @@ if ($action eq 'search') {
|
||||
if ($grouprestrict eq '1') {
|
||||
my $grouplist = join(',',
|
||||
@{Bugzilla::User->flatten_group_membership($group->id)});
|
||||
$query .= " $nextCondition profiles.userid = ugm.user_id " .
|
||||
"AND ugm.group_id IN($grouplist) " .
|
||||
"AND ugm.isbless = 0";
|
||||
$query .= " $nextCondition ugm.group_id IN($grouplist) ";
|
||||
}
|
||||
$query .= ' ORDER BY profiles.login_name';
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user