summaryrefslogtreecommitdiffstats
path: root/template
diff options
context:
space:
mode:
authorFrédéric Buclin <LpSolit@gmail.com>2012-08-09 13:45:59 +0200
committerFrédéric Buclin <LpSolit@gmail.com>2012-08-09 13:45:59 +0200
commit9ec7d139f9ab26fc2cc6986ec72d254d0fdef242 (patch)
treef151e0e128b4e93e1f631a002c621a345c43053a /template
parent17a866fde027a1236cfadc7829d0176a60dc4b51 (diff)
downloadbugzilla-9ec7d139f9ab26fc2cc6986ec72d254d0fdef242.tar.gz
bugzilla-9ec7d139f9ab26fc2cc6986ec72d254d0fdef242.tar.xz
Bug 756550: Do not link a bug alias with its bug ID for bugs you cannot see
r=glob a=LpSolit
Diffstat (limited to 'template')
-rw-r--r--template/en/default/bug/comments.html.tmpl3
-rw-r--r--template/en/default/global/user-error.html.tmpl8
2 files changed, 8 insertions, 3 deletions
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" %]
<div class="bz_add_comment">
<a href="#"
onclick="return goto_add_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 <em>[% alias FILTER html %]</em>.
- Please choose another one.
+ Please choose another alias.
[% ELSIF error == "alias_is_numeric" %]
[% title = "Alias Is Numeric" %]