Attachment 294073 Details for Bug 406471 – Add OR based group checking function in Bugzilla/Search.pm file

[patch] Add OR based group checking function in Bugzilla/Search.pm file

patch.diff (text/plain), 1.54 KB, created by Tony Fu on 2008-02-06 06:03:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tony Fu

Created: 2008-02-06 06:03:08 UTC

Size: 1.54 KB

patch

obsolete

>Index: Search.pm
>===================================================================
>RCS file: /cvs/qa/rh_bugzilla_3/Bugzilla/Search.pm,v
>retrieving revision 1.6
>diff -u -r1.6 Search.pm
>--- Search.pm	4 Feb 2008 04:54:54 -0000	1.6
>+++ Search.pm	6 Feb 2008 05:57:08 -0000
>@@ -780,14 +780,30 @@
> 
>     if ($user->id) {
>         if (%{$user->groups}) {
>-            $query .= " AND bug_group_map.group_id NOT IN (" . join(',', values(%{$user->groups})) . ") ";
>+	    # REDHAT ENTENSION START 406471
>+	    # OR based group checking
>+	    if ( Bugzilla->params->{'or_groups'} ) {
>+		$query .= " LEFT JOIN user_group_map " .
>+			  "  ON user_group_map.group_id = bug_group_map.group_id ";
>+	    # REDHAT ENTENSION END 406471
>+	    } else {
>+            	$query .= " AND bug_group_map.group_id NOT IN (" . join(',', values(%{$user->groups})) . ") ";
>+	      }
>         }
> 
>         $query .= " LEFT JOIN cc ON cc.bug_id = bugs.bug_id AND cc.who = " . $user->id;
>     }
> 
>-    $query .= " WHERE " . join(' AND ', (@wherepart, @andlist)) .
>+    # REDHAT ENTENSION START 406471
>+    # OR based group checking
>+    if ( Bugzilla->params->{'or_groups'} ) {
>+    	$query .= " WHERE " . join(' AND ', (@wherepart, @andlist)) .
>+              " AND bugs.creation_ts IS NOT NULL AND ((user_group_map.group_id IS NOT NULL)";
>+    # REDHAT ENTENSION END 406471
>+    } else {
>+    	$query .= " WHERE " . join(' AND ', (@wherepart, @andlist)) .
>               " AND bugs.creation_ts IS NOT NULL AND ((bug_group_map.group_id IS NULL)";
>+      }
> 
>     if ($user->id) {
>         my $userid = $user->id;

Actions: View | Diff

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