Bug 158499 - Templatise XML bug output

r=gerv, justdave
a=justdave

4 files changed, 90 insertions, 56 deletions

diff --git a/template/en/default/bug/choose-xml.html.tmpl b/template/en/default/bug/choose-xml.html.tmpl
deleted file mode 100644
index 045ad7c58..000000000
--- a/template/en/default/bug/choose-xml.html.tmpl
+++ /dev/null
@@ -1,51 +0,0 @@
-<!-- 1.0@bugzilla.org -->
-[%# The contents of this file are subject to the Mozilla Public
-  # License Version 1.1 (the "License"); you may not use this file
-  # except in compliance with the License. You may obtain a copy of
-  # the License at http://www.mozilla.org/MPL/
-  #
-  # Software distributed under the License is distributed on an "AS
-  # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-  # implied. See the License for the specific language governing
-  # rights and limitations under the License.
-  #
-  # The Original Code is the Bugzilla Bug Tracking System.
-  #
-  # The Initial Developer of the Original Code is Netscape Communications
-  # Corporation. Portions created by Netscape are
-  # Copyright (C) 1998 Netscape Communications Corporation. All
-  # Rights Reserved.
-  #
-  # Contributor(s): Gervase Markham <gerv@gerv.net>
-  #%]
-
-[%# INTERFACE:
-  # This template has no interface.
-  #%]
-  
-[% PROCESS global/header.html.tmpl 
-   title = "Display bugs as XML"
- %]
-
-<form method="get" action="xml.cgi">
-  <table>
-    <tr>
-      <td>
-        Display bugs as XML by entering a list of bug numbers here:
-      </td>
-      <td>
-        <input name="id" size="30">
-        <input type="submit" value="Display as XML">
-      </td>
-    </tr>
-    
-    <tr>
-      <td>&nbsp;</td>
-      <td>
-        (e.g. 1000, 2467, 852)
-      </td>
-    </tr>
-  </table>
-</form>
-
-[% PROCESS global/footer.html.tmpl %]
diff --git a/template/en/default/bug/choose.html.tmpl b/template/en/default/bug/choose.html.tmpl
index a9a62567c..f965ccc4d 100644
--- a/template/en/default/bug/choose.html.tmpl
+++ b/template/en/default/bug/choose.html.tmpl
@@ -19,11 +19,9 @@
   # Contributor(s): Gervase Markham <gerv@gerv.net>
   #%]
 
-[% UNLESS header_done %]
-  [% PROCESS global/header.html.tmpl 
-     title = "Search by bug number"
-   %]
-[% END %]
+[% PROCESS global/header.html.tmpl 
+   title = "Search by bug number"
+ %]
 
 <form method="get" action="show_bug.cgi">
   <p>
diff --git a/template/en/default/bug/show.html.tmpl b/template/en/default/bug/show.html.tmpl
index 46f8c4674..637583502 100644
--- a/template/en/default/bug/show.html.tmpl
+++ b/template/en/default/bug/show.html.tmpl
@@ -21,6 +21,9 @@
   #                 Bradley Baetz <bbaetz@student.usyd.edu.au>
   #%]
 
+[%# This script/template only handles one bug #%]
+[% bug = bugs.0 %]
+
 [% filtered_desc = bug.short_desc FILTER html %]
 [% filtered_timestamp = bug.delta_ts FILTER time %]
 [% PROCESS global/header.html.tmpl 
diff --git a/template/en/default/bug/show.xml.tmpl b/template/en/default/bug/show.xml.tmpl
new file mode 100644
index 000000000..501ec2c17
--- /dev/null
+++ b/template/en/default/bug/show.xml.tmpl
@@ -0,0 +1,84 @@
+[%# 1.0@bugzilla.org #%]
+[%# The contents of this file are subject to the Mozilla Public
+  # License Version 1.1 (the "License"); you may not use this file
+  # except in compliance with the License. You may obtain a copy of
+  # the License at http://www.mozilla.org/MPL/
+  #
+  # Software distributed under the License is distributed on an "AS
+  # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+  # implied. See the License for the specific language governing
+  # rights and limitations under the License.
+  #
+  # The Original Code is the Bugzilla Bug Tracking System.
+  #
+  # The Initial Developer of the Original Code is Netscape Communications
+  # Corporation. Portions created by Netscape are
+  # Copyright (C) 1998 Netscape Communications Corporation. All
+  # Rights Reserved.
+  #
+  # Contributor(s): Bradley Baetz <bbaetz@student.usyd.edu.au>
+  #
+  #%]
+<?xml version="1.0" standalone="yes"?>
+<!DOCTYPE bugzilla SYSTEM "[% Param('urlbase') %]bugzilla.dtd">
+
+<bugzilla version="[% VERSION %]"
+          urlbase="[% Param('urlbase') %]"
+          maintainer="[% Param('maintainer') FILTER xml %]"
+[% IF user.login %]
+          exporter="[% user.login FILTER xml %]"
+[% END %]
+>
+
+[% FOREACH bug = bugs %]
+  [% IF bug.error %]
+    <bug error="[% bug.error FILTER xml %]">
+      <bug_id>[% bug.bug_id FILTER xml %]</bug_id>
+    </bug>
+  [% ELSE %]
+    <bug>
+      [% FOREACH field = bug.fields %]
+        [%+ PROCESS bug_field %]
+      [% END %]
+
+      [%# Now handle 'special' fields #%]
+      [% FOREACH g = bug.groups %]
+        [% NEXT UNLESS g.ison %]
+        <group>[% g.name FILTER xml %]</group>
+      [% END %]
+
+      [% FOREACH c = bug.longdescs %]
+        <long_desc>
+          <who>[% c.email FILTER xml %]</who>
+          <bug_when>[% c.time FILTER time FILTER xml %]</bug_when>
+          <thetext>[% c.body FILTER xml %]</thetext>
+        </long_desc>
+      [% END %]
+
+      [% FOREACH a = bug.attachments %]
+        <attachment>
+          <attachid>[% a.attachid %]</attachid>
+          <date>[% a.date FILTER time FILTER xml %]</date>
+          <desc>[% a.description FILTER xml %]</desc>
+        </attachment>
+      [% END %]
+    </bug>
+  [% END %]
+[% END %]
+
+</bugzilla>
+
+[% BLOCK bug_field %]
+  [% FOREACH val = bug.$field %]
+    [%# We need to handle some fields differently. This should become
+      # nicer once we have custfields, and a type attribute for the fields
+      #%]
+    [% IF field == 'reporter' OR field == 'assigned_to' OR
+          field == 'qa_contact' %]
+      [% val = val.email %]
+    [% ELSIF field == 'creation_ts' OR field == 'delta_ts' %]
+      [% val = val FILTER time %]
+    [% END %]
+    <[% field %]>[% val FILTER xml %]</[% field %]>
+  [% END %]
+[% END %]