Bug 405342: "My requests" is broken - Patch by Frédéric Buclin <LpSolit@gmail.com> r=bkor a=LpSolit

2 files changed, 11 insertions, 2 deletions

diff --git a/request.cgi b/request.cgi
index 6c3ff48ee..c854a1767 100755
--- a/request.cgi
+++ b/request.cgi
@@ -42,6 +42,7 @@ use Bugzilla::Component;
 # Make sure the user is logged in.
 my $user = Bugzilla->login();
 my $cgi = Bugzilla->cgi;
+my $dbh = Bugzilla->dbh;
 my $template = Bugzilla->template;
 my $action = $cgi->param('action') || '';
 
@@ -67,7 +68,15 @@ if ($action eq 'queue') {
     queue();
 }
 else {
-    $template->process('request/queue.html.tmpl', {requests => {}})
+    my $flagtypes = $dbh->selectcol_arrayref('SELECT DISTINCT(name) FROM flagtypes
+                                              ORDER BY name');
+    my @types = ('all', @$flagtypes);
+
+    my $vars = {};
+    $vars->{'products'} = $user->get_selectable_products;
+    $vars->{'types'} = \@types;
+    $vars->{'requests'} = {};
+    $template->process('request/queue.html.tmpl', $vars)
       || ThrowTemplateError($template->error());
 }
 exit;
diff --git a/template/en/default/global/common-links.html.tmpl b/template/en/default/global/common-links.html.tmpl
index 033b98069..94fed709f 100644
--- a/template/en/default/global/common-links.html.tmpl
+++ b/template/en/default/global/common-links.html.tmpl
@@ -42,7 +42,7 @@
     <span class="separator">| </span>
     [% IF user.id %]
       <a href="request.cgi?requester=[% user.login FILTER url_quote %]&amp;requestee=
-               [% user.login FILTER url_quote %]&amp;do_union=1&amp;group=type">My Requests</a>
+               [% user.login FILTER url_quote %]&amp;do_union=1&amp;group=type&amp;action=queue">My Requests</a>
     [% ELSE %]
       <a href="request.cgi">Requests</a>
     [% END %]