Attachment 298956 Details for Bug 406471 – Changes to User.pm to update can_see_product and get_selectable_products (dkl) (v1)

[patch] Changes to User.pm to update can_see_product and get_selectable_products (dkl) (v1)

products_perms.patch (text/plain), 3.41 KB, created by David Lawrence on 2008-03-24 21:49:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Lawrence

Created: 2008-03-24 21:49:18 UTC

Size: 3.41 KB

patch

obsolete

>Index: Bugzilla/User.pm
>===================================================================
>RCS file: /cvs/qa/rh_bugzilla_3/Bugzilla/User.pm,v
>retrieving revision 1.6
>diff -u -r1.6 User.pm
>--- Bugzilla/User.pm	17 Mar 2008 20:59:04 -0000	1.6
>+++ Bugzilla/User.pm	24 Mar 2008 21:48:39 -0000
>@@ -564,44 +564,27 @@
>     my $dbh = Bugzilla->dbh;
> 
>     # REDHAT EXTENSION START 406471
>-    my $has_external_groups;
>     # OR based group checking
>     if ( Bugzilla->params->{'or_groups'} ) {
>-        my $can_edit_cnt
>-            = $dbh->selectrow_array('SELECT COUNT(*)
>-                                     FROM   group_control_map
>-                                     WHERE  canedit != 0
>-                                            AND product_id = ?',
>-                                    undef, $prod_id);
>-        my $group_member_cnt
>-            = $dbh->selectrow_array('SELECT COUNT(group_id)
>-                                     FROM   group_control_map
>-                                     WHERE  canedit != 0
>-                                            AND product_id = ?
>-                                            AND group_id IN (' . $self->groups_as_string . ')',
>-                                    undef, $prod_id);
>-
>-        if (!$can_edit_cnt) {
>-            $has_external_groups = 0;
>-        }
>-        else {
>-            if ($group_member_cnt) {
>-                $has_external_groups = 0;
>-            }
>-            else {
>-                $has_external_groups = 1;
>-            }
>-        }
>+        my $groups = $self->groups_as_string;
>+        my ($cnt_can_edit, $cnt_group_member) = $dbh->selectrow_array(
>+           "SELECT SUM(foo.cnt_can_edit),
>+                   SUM(foo.cnt_group_member)
>+              FROM (SELECT CASE WHEN canedit = 1 THEN 1 ELSE 0 END AS cnt_can_edit,
>+                           CASE WHEN canedit = 1 AND group_id IN ($groups) THEN 1 ELSE 0 END AS cnt_group_member
>+                      FROM group_control_map
>+                     WHERE product_id = $prod_id) AS foo");
>+        return ($cnt_can_edit == 0 or $cnt_group_member > 0);
>+    } 
>     # REDHAT EXTENSION END 406471
>-    } else {
>-        $has_external_groups =
>+
>+    my $has_external_groups =
>         $dbh->selectrow_array('SELECT 1
>                                FROM group_control_map
>                               WHERE product_id = ?
>                                 AND canedit != 0
>                                 AND group_id NOT IN(' . $self->groups_as_string . ')',
>                              undef, $prod_id);
>-      }
> 
>     return !$has_external_groups;
> }
>@@ -687,13 +670,12 @@
>         } else {
>             $query .= " AND group_control_map.membercontrol = " . CONTROLMAPMANDATORY;
>         }
>+
>         # 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_control_map.group_id IS NULL " .
>+                       "        OR group_control_map.group_id IN (" . $self->groups_as_string . ")) ";
>         } else {
>             $query .= "       AND group_id NOT IN (" . $self->groups_as_string . ") " .
>                       " WHERE group_id IS NULL ";

Flags:

dkl: review? (tfu)

Actions: View | Diff

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