aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlpsolit%gmail.com <>2009-08-05 01:25:44 +0000
committerlpsolit%gmail.com <>2009-08-05 01:25:44 +0000
commit8b2db148f30d74283d3a80ebd77691c94a1ca4a7 (patch)
tree14f8a74732dceef338a3a2c90259d42033ceacf7
parentAdditional fix for bug 508023, to make upgrades from 3.1.4 succeed. (diff)
downloadbugzilla-8b2db148f30d74283d3a80ebd77691c94a1ca4a7.tar.gz
bugzilla-8b2db148f30d74283d3a80ebd77691c94a1ca4a7.tar.bz2
bugzilla-8b2db148f30d74283d3a80ebd77691c94a1ca4a7.zip
Bug 508416: Bug flags are always displayed in the XML view of bugs - Patch by Frédéric Buclin <LpSolit@gmail.com> r=ghendricks a=LpSolit
-rwxr-xr-xshow_bug.cgi2
-rw-r--r--template/en/default/bug/show.xml.tmpl21
2 files changed, 13 insertions, 10 deletions
diff --git a/show_bug.cgi b/show_bug.cgi
index 746167eef..42fad7121 100755
--- a/show_bug.cgi
+++ b/show_bug.cgi
@@ -116,7 +116,7 @@ $vars->{'bug_list'} = \@bug_list;
# If no explicit list is defined, we show all fields. We then exclude any
# on the exclusion list. This is so you can say e.g. "Everything except
# attachments" without listing almost all the fields.
-my @fieldlist = (Bugzilla::Bug->fields, 'group', 'long_desc',
+my @fieldlist = (Bugzilla::Bug->fields, 'flag', 'group', 'long_desc',
'attachment', 'attachmentdata', 'token');
my %displayfields;
diff --git a/template/en/default/bug/show.xml.tmpl b/template/en/default/bug/show.xml.tmpl
index cb0b10a42..12c813d87 100644
--- a/template/en/default/bug/show.xml.tmpl
+++ b/template/en/default/bug/show.xml.tmpl
@@ -62,18 +62,21 @@
[% END %]
[%# Bug Flags %]
- [% FOREACH type = bug.flag_types %]
- [% FOREACH flag = type.flags %]
- <flag name="[% type.name FILTER xml %]"
- id="[% flag.id FILTER xml %]"
- status="[% flag.status FILTER xml %]"
- setter="[% flag.setter.login FILTER email FILTER xml %]"
- [% IF flag.requestee %]
- requestee="[% flag.requestee.login FILTER email FILTER xml %]"
+ [% IF displayfields.flag %]
+ [% FOREACH type = bug.flag_types %]
+ [% FOREACH flag = type.flags %]
+ <flag name="[% type.name FILTER xml %]"
+ id="[% flag.id FILTER xml %]"
+ status="[% flag.status FILTER xml %]"
+ setter="[% flag.setter.login FILTER email FILTER xml %]"
+ [% IF flag.requestee %]
+ requestee="[% flag.requestee.login FILTER email FILTER xml %]"
+ [% END %]
+ />
[% END %]
- />
[% END %]
[% END %]
+
[% IF displayfields.long_desc %]
[% FOREACH c = bug.longdescs %]
[% NEXT IF c.isprivate && !user.in_group(Param("insidergroup")) %]