From 92f16f758434dd1ce92a1043ade9bf7f8438fa78 Mon Sep 17 00:00:00 2001
From: David Lawrence <dkl@mozilla.com>
Date: Fri, 24 Jul 2015 08:18:16 +0000
Subject: Bug 1184828: backport bug 1161070 to bmo (api searches should honour
 the same fields in its "order" parameter as the web UI)

---
 buglist.cgi | 35 ++++++++++++-----------------------
 1 file changed, 12 insertions(+), 23 deletions(-)

(limited to 'buglist.cgi')

diff --git a/buglist.cgi b/buglist.cgi
index f2cc0a53c..055de388d 100755
--- a/buglist.cgi
+++ b/buglist.cgi
@@ -681,29 +681,18 @@ my @order_columns;
 if ($order) {
     # Convert the value of the "order" form field into a list of columns
     # by which to sort the results.
-    ORDER: for ($order) {
-        /^Bug Number$/ && do {
-            @order_columns = ("bug_id");
-            last ORDER;
-        };
-        /^Importance$/ && do {
-            @order_columns = ("priority", "bug_severity");
-            last ORDER;
-        };
-        /^Assignee$/ && do {
-            @order_columns = ("assigned_to", "bug_status", "priority",
-                              "bug_id");
-            last ORDER;
-        };
-        /^Last Changed$/ && do {
-            @order_columns = ("changeddate", "bug_status", "priority",
-                              "assigned_to", "bug_id");
-            last ORDER;
-        };
-        do {
-            # A custom list of columns. Bugzilla::Search will validate items.
-            @order_columns = split(/\s*,\s*/, $order);
-        };
+    my %order_types = (
+        "Bug Number"   => [ "bug_id" ],
+        "Importance"   => [ "priority", "bug_severity" ],
+        "Assignee"     => [ "assigned_to", "bug_status", "priority", "bug_id" ],
+        "Last Changed" => [ "changeddate", "bug_status", "priority",
+                            "assigned_to", "bug_id" ],
+    );
+    if ($order_types{$order}) {
+        @order_columns = @{ $order_types{$order} };
+    }
+    else {
+        @order_columns = split(/\s*,\s*/, $order);
     }
 }
 
-- 
cgit v1.2.3-24-g4f1b