diff options
| author | Dylan William Hardison <dylan@hardison.net> | 2018-04-01 16:52:36 +0200 |
|---|---|---|
| committer | Dylan William Hardison <dylan@hardison.net> | 2018-04-01 16:52:36 +0200 |
| commit | ab229b9a828b77f8a3b9ce215f0dfed4c84d4ae5 (patch) | |
| tree | 483da9c8b66f4444bb8a410e3d599c7484ad721e /extensions/BugModal | |
| parent | daa2d6b1c40354ecce0e48e6c5ee686efe642c4b (diff) | |
| parent | 2f8b999750cc700faf03c6aee1c53d1fc4df767f (diff) | |
| download | bugzilla-ab229b9a828b77f8a3b9ce215f0dfed4c84d4ae5.tar.gz bugzilla-ab229b9a828b77f8a3b9ce215f0dfed4c84d4ae5.tar.xz | |
Merge branch 'master' into unstable
Diffstat (limited to 'extensions/BugModal')
| -rw-r--r-- | extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl | 2 | ||||
| -rw-r--r-- | extensions/BugModal/template/en/default/bug_modal/navigate.html.tmpl | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl index a8d55c137..51919ab27 100644 --- a/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl +++ b/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl @@ -365,7 +365,7 @@ ", " UNLESS loop.last; END; - CASE [ 'assigned_to', 'reporter', 'qa_contact', 'cc', 'flagtypes.name' ]; + CASE [ 'assigned_to', 'reporter', 'qa_contact', 'cc', 'bug_mentor', 'flagtypes.name' ]; value FILTER email; CASE 'reporter_accessible'; diff --git a/extensions/BugModal/template/en/default/bug_modal/navigate.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/navigate.html.tmpl index 05476fed4..06163a841 100644 --- a/extensions/BugModal/template/en/default/bug_modal/navigate.html.tmpl +++ b/extensions/BugModal/template/en/default/bug_modal/navigate.html.tmpl @@ -29,14 +29,14 @@ [% INCLUDE nav_link text="Next ❱" bug_id="" %] [% END %] [% INCLUDE nav_link text="Last ❱❱" bug_id=last_bug_list.last %] - <a id="search-nav-reget" href="buglist.cgi?regetlastlist=[% my_search.id FILTER uri %]">Last search results</a> + <a id="search-nav-reget" href="buglist.cgi?regetlastlist=[% search.id FILTER uri %]">Last search results</a> </div> [% BLOCK nav_link %] [% IF bug_id == "" %] <span class="search-nav-disabled">[% text FILTER none %]</span> [% ELSE %] - <a class="search-nav-link" href="show_bug.cgi?id=[% bug_id FILTER uri %]&list_id=[% my_search.id FILTER uri %]"> + <a class="search-nav-link" href="show_bug.cgi?id=[% bug_id FILTER uri %]&list_id=[% search.id FILTER uri %]"> [%~ text FILTER none ~%] </a> [% END %] |