summaryrefslogtreecommitdiffstats
path: root/template/en
diff options
context:
space:
mode:
authorByron Jones <bjones@mozilla.com>2011-05-10 07:47:46 +0200
committerByron Jones <bjones@mozilla.com>2011-05-10 07:47:46 +0200
commit804336689c430040f478520ea6655260cbd6735d (patch)
tree7331f2df14035ff6e59de1200f8cb0b0b49fb303 /template/en
parent12a41578a29208f7e2ef32129ae1a9f4ae7a4f83 (diff)
downloadbugzilla-804336689c430040f478520ea6655260cbd6735d.tar.gz
bugzilla-804336689c430040f478520ea6655260cbd6735d.tar.xz
Bug 28849: Block users from CCing other users if they do not have editbugs privs
r=LpSolit, a=LpSolit
Diffstat (limited to 'template/en')
-rw-r--r--template/en/default/bug/edit.html.tmpl16
-rw-r--r--template/en/default/global/user-error.html.tmpl4
2 files changed, 17 insertions, 3 deletions
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 0aa5f80af..f64d589c9 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -830,16 +830,26 @@
</div>
[% END %]
[% IF bug.cc %]
- <select id="cc" name="cc" multiple="multiple" size="5">
+ <select id="cc" multiple="multiple" size="5"
+ [% IF bug.user.canedit %]name="cc"[% END %]>
[% FOREACH c = bug.cc %]
<option value="[% c FILTER email FILTER html %]">
[% c FILTER email FILTER html %]</option>
[% END %]
</select>
- [% IF user.id %]
+ [% IF user.id && !bug.user.canedit %]
+ <input type="hidden" name="cc" value="[% user.login FILTER email FILTER html %]">
+ [% END %]
+ [% IF user.id AND (bug.user.canedit OR bug.cc.contains(user.login)) %]
<br>
<input type="checkbox" id="removecc" name="removecc">
- [%%]<label for="removecc">Remove selected CCs</label>
+ <label for="removecc">
+ [% IF bug.user.canedit %]
+ Remove selected CCs
+ [% ELSE %]
+ Remove me from the CC list
+ [% END %]
+ </label>
<br>
[% END %]
[% END %]
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 1dd747f30..52bacc457 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -280,6 +280,10 @@
'query.html#list' => "$terms.Bug lists"} %]
You may not search, or create saved searches, without any search terms.
+ [% ELSIF error == "cc_remove_denied" %]
+ [% title = "Change Denied" %]
+ You do not have permission to remove other people from the CC list.
+
[% ELSIF error == "chart_too_large" %]
[% title = "Chart Too Large" %]
Sorry, but 2000 x 2000 is the maximum size for a chart.