Attachment 294306 Details for Bug 406471 – 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), 2.96 KB, created by Tony Fu on 2008-02-08 07:39:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tony Fu

Created: 2008-02-08 07:39:24 UTC

Size: 2.96 KB

patch

obsolete

>Index: User.pm
>===================================================================
>RCS file: /cvs/qa/rh_bugzilla_3/Bugzilla/User.pm,v
>retrieving revision 1.3
>diff -u -r1.3 User.pm
>--- User.pm	20 Jan 2008 16:38:25 -0000	1.3
>+++ User.pm	8 Feb 2008 07:31:00 -0000
>@@ -636,9 +636,19 @@
>         } else {
>             $query .= " AND group_control_map.membercontrol = " . CONTROLMAPMANDATORY;
>         }
>-        $query .= "     AND group_id NOT IN(" . $self->groups_as_string . ") " .
>-                  "   WHERE group_id IS NULL " .
>-                  "ORDER BY name";
>+        # 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"
>+        } else {
>+            $query .= "     AND group_id NOT IN(" . $self->groups_as_string . ") " .
>+                      " WHERE group_id IS NULL "
>+          }
>+        $query .= " ORDER BY name";
>+        # REDHAT ENTENSION END 406471
> 
>         my $prod_ids = Bugzilla->dbh->selectcol_arrayref($query);
>         $self->{selectable_products} = Bugzilla::Product->new_from_list($prod_ids);
>@@ -720,17 +730,24 @@
>     if (defined $self->{enterable_products}) {
>         return $self->{enterable_products};
>     }
>-
>-     # All products which the user has "Entry" access to.
>-     my @enterable_ids =@{$dbh->selectcol_arrayref(
>-           'SELECT products.id FROM products
>-         LEFT JOIN group_control_map
>-                   ON group_control_map.product_id = products.id
>-                      AND group_control_map.entry != 0
>-                      AND group_id NOT IN (' . $self->groups_as_string . ')
>-            WHERE group_id IS NULL
>-                  AND products.disallownew = 0') || []};
>-
>+    # REDHAT EXTENSION START 406471
>+    # add OR based group checking
>+     my $query = "SELECT products.id FROM products" .
>+                 " LEFT JOIN group_control_map" .
>+                 " 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"
>+    } else {
>+            $query .= " AND group_id NOT IN (" . $self->groups_as_string . ")" .
>+                      " WHERE group_id IS NULL"
>+      }
>+    $query .= " AND products.disallownew = 0";
>+    # REDHAT EXTENSION END 406471
>+    my @enterable_ids =@{$dbh->selectcol_arrayref($query) || []};
>     if (@enterable_ids) {
>         # And all of these products must have at least one component
>         # and one version.

Actions: View | Diff

Attachments on bug 406471: 293982 | 293983 | 293984 | 294053 | 294073 | 294075 | 294076 | 294190 | 294306 | 294480 | 294619 | 294629 | 294714 | 294715 | 294863 | 294968 | 298956