diff options
| author | Hugo Seabrook <hugo.seabrook@gmail.com> | 2013-02-15 07:04:00 +0100 |
|---|---|---|
| committer | Byron Jones <bjones@mozilla.com> | 2013-02-15 07:04:00 +0100 |
| commit | 921e81caf7ffc083ac664459b015d38fc250437d (patch) | |
| tree | c5e85301c2365b5b641772696db57c24a02c6c58 /template/en/default/bug | |
| parent | b6dedf486972c23b05f16a00c2be1c32e139eb1f (diff) | |
| download | bugzilla-921e81caf7ffc083ac664459b015d38fc250437d.tar.gz bugzilla-921e81caf7ffc083ac664459b015d38fc250437d.tar.xz | |
Bug 830333: Make the comment box hidden if bug_check_can_change_field reports the user is unable to comment on the bug
r=glob, a=LpSolit
Diffstat (limited to 'template/en/default/bug')
| -rw-r--r-- | template/en/default/bug/comments.html.tmpl | 14 | ||||
| -rw-r--r-- | template/en/default/bug/edit.html.tmpl | 22 |
2 files changed, 21 insertions, 15 deletions
diff --git a/template/en/default/bug/comments.html.tmpl b/template/en/default/bug/comments.html.tmpl index 62beb61ea..d2de3521c 100644 --- a/template/en/default/bug/comments.html.tmpl +++ b/template/en/default/bug/comments.html.tmpl @@ -141,18 +141,20 @@ [% IF mode == "edit" %] <span class="bz_comment_actions"> - [<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', 0, 1) %] + [<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 3ca5ab4a5..c48b17c08 100644 --- a/template/en/default/bug/edit.html.tmpl +++ b/template/en/default/bug/edit.html.tmpl @@ -1052,7 +1052,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')"> @@ -1064,14 +1064,18 @@ <!-- 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 %] + You are not allowed to make an additional comment on this [% terms.bug %]. + [% END %] <br> [% PROCESS commit_button id=""%] |