summaryrefslogtreecommitdiffstats
path: root/extensions
diff options
context:
space:
mode:
authorByron Jones <glob@mozilla.com>2015-04-01 06:47:14 +0200
committerByron Jones <glob@mozilla.com>2015-04-01 06:47:14 +0200
commitae1ea40acf1f8a8d94e612e59ee0b9ebaf303707 (patch)
tree77367196558415ae17d2f1f5ec2891171774a88a /extensions
parentae43a6a2e60c07a474debe60c4a1f08753d42b35 (diff)
downloadbugzilla-ae1ea40acf1f8a8d94e612e59ee0b9ebaf303707.tar.gz
bugzilla-ae1ea40acf1f8a8d94e612e59ee0b9ebaf303707.tar.xz
Bug 1149881: unable to + a bug-level flag which was set by another user
Diffstat (limited to 'extensions')
-rw-r--r--extensions/BugModal/template/en/default/bug_modal/flags.html.tmpl7
1 files changed, 3 insertions, 4 deletions
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 %]