buildmaster/build-list.php: make sorting cooperate with filtering

1 files changed, 9 insertions, 11 deletions

diff --git a/buildmaster/build-list.php b/buildmaster/build-list.php
index 34f058b..0a41a88 100644
--- a/buildmaster/build-list.php
+++ b/buildmaster/build-list.php
@@ -473,16 +473,6 @@ foreach ($single_select_search_criteria as $criterium) {
       </div>
 <?php
 
-foreach ($to_shows as $link => $dummy) {
-  print "-\n";
-  if ($link != $to_show)
-    print "<a href=\"?show=" . $link . "\">";
-  print $link . " package builds";
-  if ($link != $to_show)
-    print "</a>";
-  print "\n";
-}
-
 if ($count > 0) {
 
 ?>
@@ -495,7 +485,15 @@ if ($count > 0) {
 foreach ($columns as $column) {
 
   print "            <th>\n";
-  print "              <a href=\"?show=" . $to_show . "&sort=";
+  print "              <a href=\"?";
+  print substr(
+    str_replace(
+      "&sort=".$_GET["sort"]."&",
+      "&",
+      "&" . $_SERVER["QUERY_STRING"] . "&"
+    ),
+    1
+  ) . "sort=";
   if ($column["sort"] == $_GET["sort"])
     print "-";
   print $column["sort"] . "\" ";