summaryrefslogtreecommitdiffstats
path: root/template
diff options
context:
space:
mode:
authorByron Jones <bjones@mozilla.com>2013-02-13 17:23:29 +0100
committerByron Jones <bjones@mozilla.com>2013-02-13 17:23:29 +0100
commit8076cbac92c228d086e84ebedef01dfff106cd62 (patch)
tree5c0661e1e874ad9386fd897e01ab58f4d58ee7c1 /template
parent6beadee1270482d38ec4b500340af1b28df9b165 (diff)
downloadbugzilla-8076cbac92c228d086e84ebedef01dfff106cd62.tar.gz
bugzilla-8076cbac92c228d086e84ebedef01dfff106cd62.tar.xz
Bug 690833: Add the ability to restrict who can add comments to a bug report
Diffstat (limited to 'template')
-rw-r--r--template/en/default/bug/comments.html.tmpl14
-rw-r--r--template/en/default/bug/edit.html.tmpl29
-rw-r--r--template/en/default/flag/list.html.tmpl2
3 files changed, 28 insertions, 17 deletions
diff --git a/template/en/default/bug/comments.html.tmpl b/template/en/default/bug/comments.html.tmpl
index 23f024ae1..a876fb081 100644
--- a/template/en/default/bug/comments.html.tmpl
+++ b/template/en/default/bug/comments.html.tmpl
@@ -170,18 +170,20 @@
[<a class="bz_wrap_link" href="#"
onclick="return toggleCommentWrap(this, [% count %])">wrap</a>]
[% END %]
- [<a class="bz_reply_link" href="#add_comment"
- [% IF user.settings.quote_replies.value != 'off' %]
- onclick="replyToComment('[% count %]', '[% comment.id %]', '[% comment.author.name || comment.author.nick FILTER html FILTER js %]'); return false;"
- [% END %]
- >reply</a>]
+ [% IF bug.check_can_change_field('longdesc', 1, 0) %]
+ [<a class="bz_reply_link" href="#add_comment"
+ [% IF user.settings.quote_replies.value != 'off' %]
+ onclick="replyToComment('[% count %]', '[% comment.id %]', '[% comment.author.name || comment.author.nick FILTER html FILTER js %]'); return false;"
+ [% END %]
+ >reply</a>]
+ [% END %]
<script type="text/javascript"><!--
addCollapseLink([% count %], 'Toggle comment display'); // -->
</script>
</span>
[% END %]
- [% IF mode == "edit" && user.is_insider %]
+ [% IF mode == "edit" && user.is_insider && bug.check_can_change_field('longdesc', 0, 1) %]
<div class="bz_private_checkbox">
<input type="hidden" value="1"
name="defined_isprivate_[% comment.id %]">
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 52e5865b8..d57d9641c 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -903,7 +903,7 @@
flag_types = bug.flag_types
any_flags_requesteeble = bug.any_flags_requesteeble %]
[% END %]
- [% IF show_more_flags %]
+ [% IF show_more_flags && bug.check_can_change_field('flagtypes.name', 0, 1) %]
<span id="bz_flags_more_container" class="bz_default_hidden">
[% IF !bug_flags_set %]<em>None yet set</em>[% END %]
(<a href="#" id="bz_flags_more_action">[% IF !bug_flags_set %]set[% ELSE %]more[% END %] flags</a>)
@@ -1090,7 +1090,7 @@
<label for="comment" accesskey="c"><b>Additional
<u>C</u>omments</b></label>:
- [% IF user.is_insider %]
+ [% IF user.is_insider && bug.check_can_change_field('longdesc', 0, 1) %]
<input type="checkbox" name="comment_is_private" value="1"
id="newcommentprivacy"
onClick="updateCommentTagControl(this, 'comment')">
@@ -1102,14 +1102,23 @@
<!-- This table keeps the submit button aligned with the box. -->
<table><tr><td>
- [% INCLUDE global/textarea.html.tmpl
- name = 'comment'
- id = 'comment'
- minrows = 10
- maxrows = 25
- cols = constants.COMMENT_COLS
- %]
- [% Hook.process("after_comment_textarea", 'bug/edit.html.tmpl') %]
+ [% IF bug.check_can_change_field('longdesc', 0, 1) %]
+ [% INCLUDE global/textarea.html.tmpl
+ name = 'comment'
+ id = 'comment'
+ minrows = 10
+ maxrows = 25
+ cols = constants.COMMENT_COLS
+ %]
+ [% Hook.process("after_comment_textarea", 'bug/edit.html.tmpl') %]
+ [% ELSE %]
+ <div id="comment">
+ <fieldset>
+ <legend>Note</legend>
+ You are unable to make an additional comment on this [% terms.bug %].
+ </fieldset>
+ </div>
+ [% END %]
<br>
[% PROCESS commit_button id=""%]
diff --git a/template/en/default/flag/list.html.tmpl b/template/en/default/flag/list.html.tmpl
index e670515e0..16775c714 100644
--- a/template/en/default/flag/list.html.tmpl
+++ b/template/en/default/flag/list.html.tmpl
@@ -18,7 +18,7 @@
# Contributor(s): Myk Melez <myk@mozilla.org>
#%]
-[% IF user.id AND !read_only_flags %]
+[% IF user.id && !read_only_flags && bug.check_can_change_field('flagtypes.name', 0, 1) %]
[%# We list flags by looping twice over the flag types relevant for the bug.
# In the first loop, we display existing flags and then, for active types,