Bug 791564: If no flagtype is multiplicable for a given bug, then unset flags…

Bug 791564: If no flagtype is multiplicable for a given bug, then unset flags are displayed by default instead of being hidden a=LpSolit

Bug 791564: If no flagtype is multiplicable for a given bug, then unset flags…
0623dfde · Frédéric Buclin · 60539763 · 0623dfde
Commit 0623dfde authored Sep 16, 2012 by Frédéric Buclin
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

edit.html.tmpl template/en/default/bug/edit.html.tmpl +4 -4

No files found.
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -830,13 +830,13 @@
  [% bug_flags_set = 0 %]
  [% show_more_flags = 0 %]
  [% FOREACH type = bug.flag_types %]
-    [% IF (type.flags && type.flags.size > 0) || (user.id && type.is_active) %]
+    [% IF type.flags.size || (user.id && type.is_active && user.can_request_flag(type)) %]
      [% show_bug_flags = 1 %]
    [% END %]
-    [% IF user.id && type.is_active && (!type.flags || type.is_multiplicable) %]
+    [% IF user.id && type.is_active && (!type.flags.size || type.is_multiplicable) %]
      [% show_more_flags = 1 %]
    [% END %]
-    [% IF type.flags && type.flags.size > 0 %]
+    [% IF type.flags.size %]
      [% bug_flags_set = 1 %]
    [% END %]
    [% LAST IF show_bug_flags && show_more_flags && bug_flags_set %]
@@ -850,7 +850,7 @@
    </tr>
    <tr>
      <td colspan="2">
-        [% IF bug.flag_types.size > 0 %]
+        [% IF bug.flag_types.size %]
          [% PROCESS "flag/list.html.tmpl" flag_no_header = 1
                                           flag_types = bug.flag_types
                                           any_flags_requesteeble = bug.any_flags_requesteeble %]