Bug 1263520 - Cannot set r+ back to r? directly

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 d4c2d50b3df270435da63b7189547450daa7ca0a..53b5c08ca61bf3bb22ce7cd55b9af9964cf900f9 100644 (file)
--- a/extensions/BugModal/template/en/default/bug_modal/flags.html.tmpl
+++ b/extensions/BugModal/template/en/default/bug_modal/flags.html.tmpl
@@ -137,7 +137,7 @@
           <option value="X"></option>
         [% END %]
         [% IF t.is_active %]
-          [% IF (!f && t.is_requestable && user.can_request_flag(t)) || (f && user.can_unset_flag(t, f.status) && 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 == "+") %]

diff --git a/template/en/default/flag/list.html.tmpl b/template/en/default/flag/list.html.tmpl
index 7993a2a89f0e22c0688c97ed8e4041507642ed8e..55184c47b5b53af28d6471d393b7f93ed1be6648 100644 (file)
--- a/template/en/default/flag/list.html.tmpl
+++ b/template/en/default/flag/list.html.tmpl
@@ -140,7 +140,7 @@
         [% END %]
         [% IF type.is_active && can_edit_flag %]
           [% IF (!flag && type.is_requestable && user.can_request_flag(type))
-                 || (flag && user.can_unset_flag(type, flag.status) && flag.status == "?") %]
+                 || (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 == "+") %]