Attachment 302713 Details for Bug 438946 – OR based group checking in get_selectable_products() and get_enterable_products()

[patch] OR based group checking in get_selectable_products() and get_enterable_products()

patch.diff (text/plain), 1.72 KB, created by Tony Fu on 2008-04-17 06:41:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tony Fu

Created: 2008-04-17 06:41:22 UTC

Size: 1.72 KB

patch

obsolete

>Index: User.pm
>===================================================================
>RCS file: /cvs/qa/rh_bugzilla_3/Bugzilla/User.pm,v
>retrieving revision 1.7
>diff -u -r1.7 User.pm
>--- User.pm	25 Mar 2008 21:06:14 -0000	1.7
>+++ User.pm	17 Apr 2008 06:32:57 -0000
>@@ -673,10 +673,8 @@
>         # REDHAT ENTENSION START 406471
>         # OR based group checking
>         if ( Bugzilla->params->{'or_groups'} ) {
>-            $query .= "  LEFT JOIN user_group_map" .
>-                      "       ON group_control_map.group_id = user_group_map.group_id" .
>-                      " WHERE user_group_map.group_id IS NOT NULL" .
>-                      "       OR group_control_map.group_id IS NULL";
>+            $query .= "  WHERE group_id IN (" . $self->groups_as_string . ")" .
>+                      "     OR group_control_map.group_id IS NULL";
>         } else {
>             $query .= "       AND group_id NOT IN (" . $self->groups_as_string . ") " .
>                       " WHERE group_id IS NULL ";
>@@ -771,10 +769,8 @@
>                  " ON group_control_map.product_id = products.id" .
>                  " AND group_control_map.entry != 0";
>      if ( Bugzilla->params->{'or_groups'} ) {
>-            $query .= " LEFT JOIN user_group_map" .
>-                      "   ON group_control_map.group_id = user_group_map.group_id" .
>-                      " WHERE user_group_map.group_id IS NOT NULL" .
>-                      "    OR group_control_map.group_id IS NULL"
>+            $query .= "  WHERE group_id IN (" . $self->groups_as_string . ")" .
>+                      "     OR group_control_map.group_id IS NULL";
>     } else {
>             $query .= " AND group_id NOT IN (" . $self->groups_as_string . ")" .
>                       " WHERE group_id IS NULL"

Flags:

dkl: review+

Actions: View | Diff

Attachments on bug 438946: 302713