properly handle orderings in pkgreport.cgi

diff --git a/cgi/pkgreport.cgi b/cgi/pkgreport.cgi
index 455df20cea2896c7f2645c601d59a14584ce50a4..e5a4b992ef3f0946e8260fa19fd2bfbc24f70051 100755 (executable)
--- 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 d025d975dfecc94452bd6a99205f871b98199d79..da362ddc291b7a973887d786f238a1272b543fcb 100644 (file)
--- 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";
   }