Bug 307328: show.xml.tmpl now includes bug flags as well as some other missing fields...

diff --git a/template/en/default/bug/show.xml.tmpl b/template/en/default/bug/show.xml.tmpl
index 0a09668903dbce427202ccffa9a765de75541a5d..6fe3f3180cd0a977e26dfb8bf17c80ac1f42e3e6 100644 (file)
--- a/template/en/default/bug/show.xml.tmpl
+++ b/template/en/default/bug/show.xml.tmpl
@@ -51,10 +51,22 @@
         [% END %]
       [% END %]
 
+      [%# Bug Flags %]
+      [% FOREACH type = bug.flag_types %]
+        [% FOREACH flag = type.flags %]
+          <flag name="[% type.name FILTER xml %]"
+                status="[% flag.status FILTER xml %]"
+                setter="[% flag.setter.login FILTER xml %]"
+          [% IF flag.requestee %]
+              requestee="[% flag.requestee.login FILTER xml %]"
+          [% END %]
+          />
+        [% END %]
+      [% END %]
       [% IF displayfields.long_desc %]
         [% FOREACH c = bug.longdescs %]
           [% NEXT IF c.isprivate && !UserInGroup(Param("insidergroup")) %]
-          <long_desc>
+          <long_desc isprivate="[% c.isprivate FILTER xml %]">
             <who>[% c.email FILTER xml %]</who>
             <bug_when>[% c.time FILTER time FILTER xml %]</bug_when>
             <thetext>[% c.body FILTER xml %]</thetext>
@@ -66,20 +78,19 @@
         [% FOREACH a = bug.attachments %]
           [% NEXT IF a.isprivate && !UserInGroup(Param("insidergroup")) %]
           <attachment
-            [% IF a.isobsolete %]
-              isobsolete="1"
-            [% END %]
-            [% IF a.ispatch %]
-              ispatch="1"
-            [% END %]
+              isobsolete="[% a.isobsolete FILTER xml %]"
+              ispatch="[% a.ispatch FILTER xml %]"
+              isprivate="[% a.isprivate FILTER xml %]"
           >
             <attachid>[% a.id %]</attachid>
             <date>[% a.attached FILTER time FILTER xml %]</date>
             <desc>[% a.description FILTER xml %]</desc>
-            <ctype>[% a.contenttype FILTER xml %]</ctype>
+            <filename>[% a.filename FILTER xml %]</filename>
+            <type>[% a.contenttype FILTER xml %]</type>
         [% IF displayfields.attachmentdata %]
-            <data>[% a.data FILTER base64 %]</data>
+            <data encoding="base64">[% a.data FILTER base64 %]</data>
         [% END %]        
+
             [% FOREACH flag = a.flags %]
               <flag name="[% flag.type.name FILTER xml %]"
                     status="[% flag.status FILTER xml %]"