Bug 508416: Bug flags are always displayed in the XML view of bugs - Patch by FrÃ...

diff --git a/show_bug.cgi b/show_bug.cgi
index 746167eefd783968bebf54863f79b2ef19e442f1..42fad7121973dde11818eebad23c61a1dd8aa8fd 100755 (executable)
--- 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 cb0b10a42981dfb7942917d560ba39ea70e3a558..12c813d87f3db0d65360b12aaa0205a8c964409f 100644 (file)
--- 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")) %]