From fc2d539c324a34254a5cb5e9ebeb386c39220f93 Mon Sep 17 00:00:00 2001
From: David Lawrence <dkl@mozilla.com>
Date: Mon, 4 Apr 2016 16:39:14 +0000
Subject: Bug 1257662 - Disallow clearing a flag if the flag is set to allow
 granting by specifc group and changer is not in group

---
 extensions/BugModal/template/en/default/bug_modal/flags.html.tmpl | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'extensions')

diff --git a/extensions/BugModal/template/en/default/bug_modal/flags.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/flags.html.tmpl
index 3e0da1173..d4c2d50b3 100644
--- a/extensions/BugModal/template/en/default/bug_modal/flags.html.tmpl
+++ b/extensions/BugModal/template/en/default/bug_modal/flags.html.tmpl
@@ -127,15 +127,17 @@
       <input type="hidden" id="[% flag_id FILTER html %]-dirty">
       <select id="[% flag_id FILTER html %]" name="[% flag_id FILTER html %]"
         title="[% t.description FILTER html %]"
-        [% UNLESS (t.is_requestable && user.can_request_flag(t)) || user.can_set_flag(t) %]
+        [% UNLESS (t.is_requestable && user.can_request_flag(t))
+                   || user.can_set_flag(t)
+                   || (f && user.can_unset_flag(t, f.status)) %]
           disabled
         [% END %]
         class="bug-flag">
-        [% IF !f || (user.can_request_flag(t)) || f.setter_id == user.id %]
+        [% IF !f || (user.can_unset_flag(t, f.status) && user.can_request_flag(t)) || f.setter_id == user.id %]
           <option value="X"></option>
         [% END %]
         [% IF t.is_active %]
-          [% IF (t.is_requestable && user.can_request_flag(t)) || (f && f.status == "?") %]
+          [% IF (!f && t.is_requestable && user.can_request_flag(t)) || (f && user.can_unset_flag(t, f.status) && f.status == "?") %]
             <option value="?" [% "selected" IF f && f.status == "?" %]>?</option>
           [% END %]
           [% IF user.can_set_flag(t) || (f && f.status == "+") %]
-- 
cgit v1.2.3-24-g4f1b