diff options
| author | David Lawrence <dkl@mozilla.com> | 2016-04-04 18:39:14 +0200 |
|---|---|---|
| committer | David Lawrence <dkl@mozilla.com> | 2016-04-04 18:39:14 +0200 |
| commit | fc2d539c324a34254a5cb5e9ebeb386c39220f93 (patch) | |
| tree | efbb2930e4b5ae0a348e180c771f3f8ab392006c /template/en/default/flag | |
| parent | c83c4f78bb91c27e2ffd0e5fb8091fe6795885b8 (diff) | |
| download | bugzilla-fc2d539c324a34254a5cb5e9ebeb386c39220f93.tar.gz bugzilla-fc2d539c324a34254a5cb5e9ebeb386c39220f93.tar.xz | |
Bug 1257662 - Disallow clearing a flag if the flag is set to allow granting by specifc group and changer is not in group
Diffstat (limited to 'template/en/default/flag')
| -rw-r--r-- | template/en/default/flag/list.html.tmpl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/template/en/default/flag/list.html.tmpl b/template/en/default/flag/list.html.tmpl index 0d84e9bff..7993a2a89 100644 --- a/template/en/default/flag/list.html.tmpl +++ b/template/en/default/flag/list.html.tmpl @@ -133,11 +133,14 @@ class="flag_select flag_type-[% type.id %]" [% IF !can_edit_flag %] disabled="disabled"[% END %]> [%# Only display statuses the user is allowed to set. %] - [% IF !flag || (can_edit_flag && user.can_request_flag(type)) || flag.setter_id == user.id %] + [% IF !flag + || (can_edit_flag && user.can_unset_flag(type, flag.status) && user.can_request_flag(type)) + || flag.setter_id == user.id %] <option value="X"></option> [% END %] [% IF type.is_active && can_edit_flag %] - [% IF (type.is_requestable && user.can_request_flag(type)) || (flag && flag.status == "?") %] + [% IF (!flag && type.is_requestable && user.can_request_flag(type)) + || (flag && user.can_unset_flag(type, flag.status) && flag.status == "?") %] <option value="?" [% "selected" IF flag && flag.status == "?" %]>?</option> [% END %] [% IF user.can_set_flag(type) || (flag && flag.status == "+") %] |