From: Don Armstrong <don@donarmstrong.com>
Date: Wed, 28 Jun 2017 23:31:07 +0000 (-0700)
Subject: properly handle orderings in pkgreport.cgi
X-Git-Tag: release/2.6.0~129
X-Git-Url: https://git.donarmstrong.com/?p=debbugs.git;a=commitdiff_plain;h=fe207e3249ba5c49d7e24728a3bdaf1fc0f78b83

properly handle orderings in pkgreport.cgi
---

diff --git a/cgi/pkgreport.cgi b/cgi/pkgreport.cgi
index 455df20..e5a4b99 100755
--- a/cgi/pkgreport.cgi
+++ b/cgi/pkgreport.cgi
@@ -20,6 +20,7 @@ BEGIN{
 
 binmode(STDOUT,':encoding(UTF-8)');
 use POSIX qw(strftime nice);
+use List::Util qw(uniq);
 
 use Debbugs::Config qw(:globals :text :config);
 
@@ -495,6 +496,9 @@ print fill_in_template(template=>'cgi/pkgreport_javascript');
 
 print qq(<h2 class="outstanding"><!--<a class="options" href="javascript:toggle(1)">-->Options<!--</a>--></h2>\n);
 
+$param{orderings} =
+    [uniq((grep {!$hidden{$_}} keys %cats),
+	  $param{ordering})];
 print option_form(template => 'cgi/pkgreport_options',
 		  param    => \%param,
 		  form_options => $form_options,
diff --git a/templates/en_US/cgi/pkgreport_options.tmpl b/templates/en_US/cgi/pkgreport_options.tmpl
index d025d97..da362dd 100644
--- a/templates/en_US/cgi/pkgreport_options.tmpl
+++ b/templates/en_US/cgi/pkgreport_options.tmpl
@@ -46,13 +46,9 @@ include('cgi/pkgreport_options_include_exclude');
 </td>
 <td></td>
 </tr>
-<tr><td><h2>Categorize using</h2></td>
-<td></td>
-</tr>
-<tr><td><h2>Order by</h2></td>
+<tr><td><h2>Categorize/<wbr>Order using</h2></td>
 <td><select name="ordering">{ my $output = '';
-  my @orderings = qw(normal oldview raw age);
-  for my $order (@orderings) {
+  for my $order (@{$param{orderings}}) {
     $output .= '<option value="'.$order.'"'.(($order eq $param{ordering})?' selected':'').
      ">$order</option>\n";
   }