From fbe9a7a9a22004e3cc23a61b84148da8a0c300e9 Mon Sep 17 00:00:00 2001 From: Max Kanat-Alexander 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 ++++++++++++------------- template/en/default/global/user-error.html.tmpl | 2 + 2 files changed, 31 insertions(+), 32 deletions(-) (limited to 'template/en/default') 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 @@
-[% 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) %] [% terms.Bug %] List: - [% IF this_bug_idx != -1 %] - ([% this_bug_idx + 1 %] of [% last_bug_list.size %]) - [% END %] - [% IF this_bug_idx != -1 %] - First + ([% this_bug_idx + 1 %] of [% last_bug_list.size %]) + + First + Last + + [% IF this_bug_idx > 0 %] + [% prev_bug = this_bug_idx - 1 %] Last + [%- last_bug_list.$prev_bug FILTER url_quote %]&list_id= + [%- my_search.id FILTER url_quote %]">Prev + [% ELSE %] + Prev [% END %] - [% IF bug.bug_id %] - [% IF this_bug_idx != -1 %] - [% IF this_bug_idx > 0 %] - [% prev_bug = this_bug_idx - 1 %] - Prev - [% ELSE %] - Prev - [% END %] - - [% IF this_bug_idx + 1 < last_bug_list.size %] - [% next_bug = this_bug_idx + 1 %] - Next - [% ELSE %] - Next - [% 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 %] + Next [% ELSE %] -    + Next [% END %] -   Show last search results +   Show last search results [% ELSE %] [%# With no list, don't show link to search results %] First @@ -82,6 +78,7 @@ Prev Next    - No search results available + This [% terms.bug %] is not in your last + search results. [% END %]
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index 1d5997861..669d6adb3 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -1783,6 +1783,8 @@ group [% ELSIF class == "Bugzilla::Product" %] product + [% ELSIF class == "Bugzilla::Search::Recent" %] + recent search [% ELSIF class == "Bugzilla::Search::Saved" %] saved search [% ELSIF ( matches = class.match('^Bugzilla::Field::Choice::(.+)') ) %] -- cgit v1.2.3-24-g4f1b