summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrédéric Buclin <LpSolit@gmail.com>2012-09-16 19:46:07 +0200
committerFrédéric Buclin <LpSolit@gmail.com>2012-09-16 19:46:07 +0200
commit0623dfdef76b24176504fe4eac44f4fd1ac96c01 (patch)
treeaf4bb38787439a07343e43176c8ebd505fdce6ba
parent60539763cf12f98d22b0207504a05d13007d3375 (diff)
downloadbugzilla-0623dfdef76b24176504fe4eac44f4fd1ac96c01.tar.gz
bugzilla-0623dfdef76b24176504fe4eac44f4fd1ac96c01.tar.xz
Bug 791564: If no flagtype is multiplicable for a given bug, then unset flags are displayed by default instead of being hidden
a=LpSolit
-rw-r--r--template/en/default/bug/edit.html.tmpl8
1 files changed, 4 insertions, 4 deletions
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 573c7ddeb..23a11fc47 100644
--- 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 %]