1 files changed, 25 insertions, 16 deletions

diff --git a/request.cgi b/request.cgi
index 16d7662e8..5ac95f240 100755
--- a/request.cgi
+++ b/request.cgi
@@ -114,7 +114,11 @@ sub queue {
                 flags.attach_id, attachments.description,
                 requesters.realname, requesters.login_name,
                 requestees.realname, requestees.login_name, COUNT(privs.group_id),
-    " . $dbh->sql_date_format('flags.modification_date', '%Y.%m.%d %H:%i') .
+    " . $dbh->sql_date_format('flags.modification_date', '%Y.%m.%d %H:%i') . ",
+                attachments.ispatch, 
+                bugs.bug_status,  
+                bugs.priority,  
+                bugs.bug_severity " .  
     # Use the flags and flagtypes tables for information about the flags,
     # the bugs and attachments tables for target info, the profiles tables
     # for setter and requestee info, the products/components tables
@@ -175,16 +179,18 @@ sub queue {
     # column will always be the same.
     my @excluded_columns = ();
     
+    my $do_union = $cgi->param('do_union');
+
     # Filter requests by status: "pending", "granted", "denied", "all" 
     # (which means any), or "fulfilled" (which means "granted" or "denied").
     if ($status) {
         if ($status eq "+-") {
             push(@criteria, "flags.status IN ('+', '-')");
-            push(@excluded_columns, 'status') unless $cgi->param('do_union');
+            push(@excluded_columns, 'status') unless $do_union;
         }
         elsif ($status ne "all") {
             push(@criteria, "flags.status = '$status'");
-            push(@excluded_columns, 'status') unless $cgi->param('do_union');
+            push(@excluded_columns, 'status') unless $do_union;
         }
     }
     
@@ -193,7 +199,7 @@ sub queue {
         my $requester = $dbh->quote($cgi->param('requester'));
         trick_taint($requester); # Quoted above
         push(@criteria, $dbh->sql_istrcmp('requesters.login_name', $requester));
-        push(@excluded_columns, 'requester') unless $cgi->param('do_union');
+        push(@excluded_columns, 'requester') unless $do_union;
     }
     if (defined $cgi->param('requestee') && $cgi->param('requestee') ne "") {
         if ($cgi->param('requestee') ne "-") {
@@ -203,19 +209,19 @@ sub queue {
                             $requestee));
         }
         else { push(@criteria, "flags.requestee_id IS NULL") }
-        push(@excluded_columns, 'requestee') unless $cgi->param('do_union');
+        push(@excluded_columns, 'requestee') unless $do_union;
     }
     
     # Filter results by exact product or component.
     if (defined $cgi->param('product') && $cgi->param('product') ne "") {
         my $product = Bugzilla::Product->check(scalar $cgi->param('product'));
         push(@criteria, "bugs.product_id = " . $product->id);
-        push(@excluded_columns, 'product') unless $cgi->param('do_union');
+        push(@excluded_columns, 'product') unless $do_union;
         if (defined $cgi->param('component') && $cgi->param('component') ne "") {
             my $component = Bugzilla::Component->check({ product => $product,
                                                          name => scalar $cgi->param('component') });
             push(@criteria, "bugs.component_id = " . $component->id);
-            push(@excluded_columns, 'component') unless $cgi->param('do_union');
+            push(@excluded_columns, 'component') unless $do_union;
         }
     }
 
@@ -233,13 +239,12 @@ sub queue {
         my $quoted_form_type = $dbh->quote($form_type);
         trick_taint($quoted_form_type); # Already SQL quoted
         push(@criteria, "flagtypes.name = " . $quoted_form_type);
-        push(@excluded_columns, 'type') unless $cgi->param('do_union');
+        push(@excluded_columns, 'type') unless $do_union;
     }
     
-    # Add the criteria to the query.  We do an intersection by default 
-    # but do a union if the "do_union" URL parameter (for which there is no UI 
-    # because it's an advanced feature that people won't usually want) is true.
-    my $and_or = $cgi->param('do_union') ? " OR " : " AND ";
+    # Add the criteria to the query. Do a union if OR is selected.
+    # Otherwise do an intersection.
+    my $and_or = $do_union ? ' OR ' : ' AND ';
     $query .= " AND (" . join($and_or, @criteria) . ") " if scalar(@criteria);
     
     # Group the records by flag ID so we don't get multiple rows of data
@@ -250,9 +255,9 @@ sub queue {
                 products.name, components.name, flags.attach_id,
                 attachments.description, requesters.realname,
                 requesters.login_name, requestees.realname,
-                requestees.login_name, flags.modification_date,
+                requestees.login_name, flags.modification_date, attachments.ispatch
                 cclist_accessible, bugs.reporter, bugs.reporter_accessible,
-                bugs.assigned_to');
+                bugs.assigned_to, attachments.ispatch');
 
     # Group the records, in other words order them by the group column
     # so the loop in the display template can break them up into separate
@@ -278,7 +283,7 @@ sub queue {
     # Pass the query to the template for use when debugging this script.
     $vars->{'query'} = $query;
     $vars->{'debug'} = $cgi->param('debug') ? 1 : 0;
-    
+
     my $results = $dbh->selectall_arrayref($query);
     my @requests = ();
     foreach my $result (@$results) {
@@ -295,7 +300,11 @@ sub queue {
           'requester'       => ($data[9] ? "$data[9] <$data[10]>" : $data[10]) , 
           'requestee'       => ($data[11] ? "$data[11] <$data[12]>" : $data[12]) , 
           'restricted'      => $data[13] ? 1 : 0,
-          'created'         => $data[14]
+          'created'         => $data[14], 
+          'ispatch'         => $data[15], 
+          'bug_status'      => $data[16],  
+          'priority'        => $data[17],  
+          'bug_severity'    => $data[18],  
         };
         push(@requests, $request);
     }