From 9ec7d139f9ab26fc2cc6986ec72d254d0fdef242 Mon Sep 17 00:00:00 2001 From: Frédéric Buclin Date: Thu, 9 Aug 2012 13:45:59 +0200 Subject: Bug 756550: Do not link a bug alias with its bug ID for bugs you cannot see r=glob a=LpSolit --- template/en/default/bug/comments.html.tmpl | 3 ++- template/en/default/global/user-error.html.tmpl | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'template') diff --git a/template/en/default/bug/comments.html.tmpl b/template/en/default/bug/comments.html.tmpl index 4a433230b..62beb61ea 100644 --- a/template/en/default/bug/comments.html.tmpl +++ b/template/en/default/bug/comments.html.tmpl @@ -85,7 +85,8 @@ [% count = count + increment %] [% END %] -[% IF user.settings.comment_box_position.value == "before_comments" && user.id %] +[% IF mode == "edit" && user.id + && user.settings.comment_box_position.value == "before_comments" %]
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index fbb9ca169..8f4d7d21c 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -77,9 +77,13 @@ [% ELSIF error == "alias_in_use" %] [% title = "Alias In Use" %] - [% terms.Bug %] [%+ bug_id FILTER bug_link(bug_id) FILTER none %] + [% IF user.can_see_bug(bug_id) %] + [% terms.Bug %] [%+ bug_id FILTER bug_link(bug_id) FILTER none %] + [% ELSE %] + Another [% terms.bug %] + [% END %] has already taken the alias [% alias FILTER html %]. - Please choose another one. + Please choose another alias. [% ELSIF error == "alias_is_numeric" %] [% title = "Alias Is Numeric" %] -- cgit v1.2.3-24-g4f1b