From ae1ea40acf1f8a8d94e612e59ee0b9ebaf303707 Mon Sep 17 00:00:00 2001
From: Byron Jones <glob@mozilla.com>
Date: Wed, 1 Apr 2015 12:47:14 +0800
Subject: Bug 1149881: unable to + a bug-level flag which was set by another
 user

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

(limited to 'extensions/BugModal/template/en')

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 4f2381913..61e82bf2a 100644
--- a/extensions/BugModal/template/en/default/bug_modal/flags.html.tmpl
+++ b/extensions/BugModal/template/en/default/bug_modal/flags.html.tmpl
@@ -93,8 +93,7 @@
 
 [% BLOCK edit_flag %]
 [%
-  can_edit  = !f || (f.setter_id == user.id || (f.requestee_id && f.requestee_id == user.id))
-  flag_id   = f ? "flag-$f.id" : "flag_type-$t.id";
+  flag_id = f ? "flag-$f.id" : "flag_type-$t.id";
 %]
   <tr>
     <td class="flag-setter">
@@ -118,10 +117,10 @@
           disabled
         [% END %]
         class="bug-flag">
-        [% IF !f || (can_edit && user.can_request_flag(t)) || f.setter_id == user.id %]
+        [% IF !f || (user.can_request_flag(t)) || f.setter_id == user.id %]
           <option value="X"></option>
         [% END %]
-        [% IF t.is_active && can_edit %]
+        [% IF t.is_active %]
           [% IF (t.is_requestable && user.can_request_flag(t)) || (f && f.status == "?") %]
             <option value="?" [% "selected" IF f && f.status == "?" %]>?</option>
           [% END %]
-- 
cgit v1.2.3-24-g4f1b