Patch for bug 171478: XML bug output should include attachment flags; patch by Colin...

diff --git a/bugzilla.dtd b/bugzilla.dtd
index 82ccfff18c16e566af8dfe473e08eeedd132fc55..f9ced933b6894253b98065842097c3e5bf282293 100644 (file)
--- a/bugzilla.dtd
+++ b/bugzilla.dtd
@@ -47,9 +47,20 @@
 <!ELEMENT who (#PCDATA)>
 <!ELEMENT bug_when (#PCDATA)>
 <!ELEMENT thetext (#PCDATA)>
-<!ELEMENT attachment (attachid, date, desc, type?, data?)>
+<!ELEMENT attachment (attachid, date, desc, type?, data?, flag*)>
+<!ATTLIST attachment
+          isobsolete (0|1) #IMPLIED
+          ispatch (0|1) #IMPLIED
+>
 <!ELEMENT attachid (#PCDATA)>
 <!ELEMENT date (#PCDATA)>
 <!ELEMENT desc (#PCDATA)>
 <!ELEMENT type (#PCDATA)>
 <!ELEMENT data (#PCDATA)>
+<!ELEMENT flag EMPTY>
+<!ATTLIST flag
+          name CDATA #REQUIRED
+          status CDATA #REQUIRED
+          setter CDATA #IMPLIED
+          requestee CDATA #IMPLIED
+>

diff --git a/template/en/default/bug/show.xml.tmpl b/template/en/default/bug/show.xml.tmpl
index 8b29537a43cc19f040dc99806d7a80cca33f51d6..6c950a2bf7577e70bbea3a7f2f482ae60267004e 100644 (file)
--- a/template/en/default/bug/show.xml.tmpl
+++ b/template/en/default/bug/show.xml.tmpl
@@ -65,10 +65,29 @@
       [% IF displayfields.attachment %]
         [% FOREACH a = bug.attachments %]
           [% NEXT IF a.isprivate && !UserInGroup(Param("insidergroup")) %]
-          <attachment>
+          <attachment
+            [% IF a.isobsolete %]
+              isobsolete="1"
+            [% END %]
+            [% IF a.ispatch %]
+              ispatch="1"
+            [% END %]
+          >
             <attachid>[% a.attachid %]</attachid>
             <date>[% a.date FILTER time FILTER xml %]</date>
             <desc>[% a.description FILTER xml %]</desc>
+            <ctype>[% a.contenttype FILTER xml %]</ctype>
+            [% FOREACH flag = a.flags %]
+              <flag name="[% flag.type.name FILTER xml %]"
+                    status="[% flag.status FILTER xml %]"
+                    [% IF flag.setter %]
+                      setter="[% flag.setter.email FILTER xml %]"
+                    [% END %]
+                    [% IF flag.status == "?" && flag.requestee %]
+                      requestee="[% flag.requestee.email FILTER xml %]"
+                    [% END %]
+               />
+            [% END %]
           </attachment>
         [% END %]
       [% END %]