Bug 54380

Custom: XXX sort order in edit query


git-svn-id: svn://svn.office.custis.ru/3rdparty/bugzilla.org/trunk@430 6955db30-a419-402b-8a0d-67ecbb4d7f56

buglist.cgi

@@ -1031,8 +1031,7 @@ $vars->{'closedstates'} = [map {$_->name} closed_bug_statuses()];
 # a different sort order or when taking some action on the set of query
 # results).  To get this string, we call the Bugzilla::CGI::canoncalise_query
 # function with a list of elements to be removed from the URL.
-$vars->{'urlquerypart'} = $params->canonicalise_query('order',
-                                                      'cmdtype',
+$vars->{'urlquerypart'} = $params->canonicalise_query('cmdtype',
                                                       'query_based_on');
 $vars->{'order'} = $order;
 $vars->{'caneditbugs'} = 1;

query.cgi

@@ -339,7 +339,14 @@ if ($cgi->cookie('LASTORDER')) {
     unshift(@orders, $deforder);
 }
 
-if ($cgi->param('order')) { $deforder = $cgi->param('order') }
+if ($cgi->param('order'))
+{
+    $deforder = $cgi->param('order');
+    if (lsearch(\@orders, $deforder) < 0)
+    {
+        unshift @orders, $deforder;
+    }
+}
 
 $vars->{'userdefaultquery'} = $userdefaultquery;
 $vars->{'orders'} = \@orders;

template/en/default/search/knob.html.tmpl

@@ -47,7 +47,7 @@
   [% FOREACH order = orders %]
     <option value="[% order FILTER html %]"
       [% " selected" IF default.order.0 == order %]>
-         [% ordersdesc.$order FILTER html %]</option>
+         [% (ordersdesc.$order || "Custom: " _ order) FILTER html %]</option>
   [% END %]
   </select>
 </p>