Tinderbox is burning: backing out the pach for Bug 201818

4 files changed, 11 insertions, 20 deletions

diff --git a/template/en/default/bug/knob.html.tmpl b/template/en/default/bug/knob.html.tmpl
index 463132f9f..035db1ae5 100644
--- a/template/en/default/bug/knob.html.tmpl
+++ b/template/en/default/bug/knob.html.tmpl
@@ -168,7 +168,7 @@
       <b>
         <a href="show_activity.cgi?id=[% bug.bug_id %]">View [% terms.Bug %] Activity</a>
         &nbsp; | &nbsp;
-        <a href="show_bug.cgi?format=multiple&amp;id=[% bug.bug_id %]">Format For Printing</a>
+        <a href="long_list.cgi?buglist=[% bug.bug_id %]">Format For Printing</a>
       </b>
     </font>
 
diff --git a/template/en/default/bug/show-multiple.html.tmpl b/template/en/default/bug/show-multiple.html.tmpl
index 8b42217c1..a57445084 100644
--- a/template/en/default/bug/show-multiple.html.tmpl
+++ b/template/en/default/bug/show-multiple.html.tmpl
@@ -89,19 +89,13 @@
     <tr>
       [% PROCESS cell attr = { description => "Resolution",
                                name => "resolution" } %]
-      <td>
-        <b>Assigned To:</b>&nbsp;
-        [% bug.assigned_to.login FILTER html %]
-      </td>
-      <td>
-        <b>Reported By:</b>&nbsp;
-        [% bug.reporter.login FILTER html %]
-      </td>
+      [% PROCESS cell attr = { description => "Assigned To",
+                               name => "assigned_to" } %]
+      [% PROCESS cell attr = { description => "Reported By",
+                               name => "reporter" } %]
       [% IF Param('useqacontact') %]
-        <td>
-          <b>QA Contact:</b>&nbsp;
-          [% bug.qa_contact.login FILTER html %]
-        </td>
+        [% PROCESS cell attr = { description => "QA Contact",
+                                 name => "qa_contact" } %]
       [% END %]
     </tr>
 
@@ -196,7 +190,7 @@
   </table>
 
   [% PROCESS bug/comments.html.tmpl
-     comments = bug.longdescs %]
+     comments = bug.comments %]
 
   <hr>
 [% END %]
diff --git a/template/en/default/global/site-navigation.html.tmpl b/template/en/default/global/site-navigation.html.tmpl
index 66c96a137..95a7ef423 100644
--- a/template/en/default/global/site-navigation.html.tmpl
+++ b/template/en/default/global/site-navigation.html.tmpl
@@ -73,7 +73,7 @@
       <link rel="Show" title="[% terms.Bug %] Activity"
             href="show_activity.cgi?id=[% bug.bug_id %]">
       <link rel="Show" title="Printer-Friendly Version"
-            href="show_bug.cgi?format=multiple&amp;id=[% bug.bug_id %]">
+            href="long_list.cgi?buglist=[% bug.bug_id %]">
   [% END %]
 
 
diff --git a/template/en/default/list/list.html.tmpl b/template/en/default/list/list.html.tmpl
index 24d00feb6..48759ceb7 100644
--- a/template/en/default/list/list.html.tmpl
+++ b/template/en/default/list/list.html.tmpl
@@ -129,11 +129,8 @@
   <tr>
     [% IF bugs.size > 0 %]
       <td valign="middle">
-        <form method="post" action="show_bug.cgi">
-          [% FOREACH id = buglist %]
-            <input type="hidden" name="id" value="[% id FILTER html %]">
-          [% END %]
-          <input type="hidden" name="format" value="multiple">
+        <form method="post" action="long_list.cgi">
+          <input type="hidden" name="buglist" value="[% buglist %]">
           <input type="submit" value="Long Format">
         </form>
       </td>