From fbe9a7a9a22004e3cc23a61b84148da8a0c300e9 Mon Sep 17 00:00:00 2001
From: Max Kanat-Alexander <mkanat@bugzilla.org>
Date: Tue, 15 Jun 2010 18:40:27 -0700
Subject: Bug 24896: Make the First/Last/Prev/Next navigation on bugs work with
 multiple buglists at once r=glob, a=mkanat

---
 template/en/default/bug/navigate.html.tmpl | 61 ++++++++++++++----------------
 1 file changed, 29 insertions(+), 32 deletions(-)

(limited to 'template/en/default/bug/navigate.html.tmpl')

diff --git a/template/en/default/bug/navigate.html.tmpl b/template/en/default/bug/navigate.html.tmpl
index 4a3d063af..869d338dc 100644
--- a/template/en/default/bug/navigate.html.tmpl
+++ b/template/en/default/bug/navigate.html.tmpl
@@ -36,45 +36,41 @@
 
 
 <div class="navigation">
-[% IF last_bug_list.size > 0 %]
-  [% this_bug_idx = lsearch(last_bug_list, bug.id) %]
+[% SET my_search = user.recent_search_for(bug) %]
+[% IF my_search %]
+  [% SET last_bug_list = my_search.bug_list %]
+  [% SET this_bug_idx = lsearch(last_bug_list, bug.id) %]
   <b>[% terms.Bug %] List:</b>
-  [% IF this_bug_idx != -1 %]
-    ([% this_bug_idx + 1 %] of [% last_bug_list.size %])
-  [% END %]
 
-  [% IF this_bug_idx != -1 %]
-    <a href="show_bug.cgi?id=
-             [%- last_bug_list.first FILTER url_quote %]">First</a>
+  ([% this_bug_idx + 1 %] of [% last_bug_list.size %])
+
+  <a href="show_bug.cgi?id=
+           [%- last_bug_list.first FILTER url_quote %]&amp;list_id=
+           [%- my_search.id FILTER url_quote %]">First</a>
+  <a href="show_bug.cgi?id=
+           [%- last_bug_list.last FILTER url_quote %]&amp;list_id=
+           [%- my_search.id FILTER url_quote %]">Last</a>
+
+  [% IF this_bug_idx > 0 %]
+    [% prev_bug = this_bug_idx - 1 %]
     <a href="show_bug.cgi?id=
-             [%- last_bug_list.last FILTER url_quote %]">Last</a>
+             [%- last_bug_list.$prev_bug FILTER url_quote %]&amp;list_id=
+             [%- my_search.id FILTER url_quote %]">Prev</a>
+  [% ELSE %]
+    <i><font color="#777777">Prev</font></i>
   [% END %]
 
-  [% IF bug.bug_id %]
-    [% IF this_bug_idx != -1 %]
-      [% IF this_bug_idx > 0 %]
-        [% prev_bug = this_bug_idx - 1 %]
-        <a href="show_bug.cgi?id=
-                 [%- last_bug_list.$prev_bug FILTER url_quote %]">Prev</a>
-      [% ELSE %]
-        <i><font color="#777777">Prev</font></i>
-      [% END %]
-
-      [% IF this_bug_idx + 1 < last_bug_list.size %]
-        [% next_bug = this_bug_idx + 1 %]
-        <a href="show_bug.cgi?id=
-                 [%- last_bug_list.$next_bug FILTER url_quote %]">Next</a>
-      [% ELSE %]
-        <i><font color="#777777">Next</font></i>
-      [% END %]
-    [% ELSE %]
-      (This [% terms.bug %] is not in your last search results)
-    [% END %]
+  [% IF this_bug_idx + 1 < last_bug_list.size %]
+    [% next_bug = this_bug_idx + 1 %]
+    <a href="show_bug.cgi?id=
+             [%- last_bug_list.$next_bug FILTER url_quote %]&amp;list_id=
+             [%- my_search.id FILTER url_quote %]">Next</a>
   [% ELSE %]
-    &nbsp;&nbsp;
+    <i><font color="#777777">Next</font></i>
   [% END %]
 
-  &nbsp;&nbsp;<a href="buglist.cgi?regetlastlist=1">Show last search results</a>
+  &nbsp;&nbsp;<a href="buglist.cgi?regetlastlist=
+              [%- my_search.id FILTER url_quote %]">Show last search results</a>
 [% ELSE %]
   [%# With no list, don't show link to search results %]
   <i><font color="#777777">First</font></i>
@@ -82,6 +78,7 @@
   <i><font color="#777777">Prev</font></i>
   <i><font color="#777777">Next</font></i>
   &nbsp;&nbsp;
-  <i><font color="#777777">No search results available</font></i>
+  <i><font color="#777777">This [% terms.bug %] is not in your last
+    search results.</font></i>
 [% END %]
 </div>
-- 
cgit v1.2.3-24-g4f1b