From b30573c8373fe6fd6438e161efc9201e680e1285 Mon Sep 17 00:00:00 2001
From: "mkanat%bugzilla.org" <>
Date: Sun, 20 Jan 2008 08:22:25 +0000
Subject: Bug 412836: Clean up process_bug.cgi now that we have
 Bugzilla::Bug->update Patch By Max Kanat-Alexander <mkanat@bugzilla.org>
 r=LpSolit, a=LpSolit

---
 template/en/default/bug/process/midair.html.tmpl | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'template/en/default/bug/process')

diff --git a/template/en/default/bug/process/midair.html.tmpl b/template/en/default/bug/process/midair.html.tmpl
index 3d76e1754..31dbc7b3c 100644
--- a/template/en/default/bug/process/midair.html.tmpl
+++ b/template/en/default/bug/process/midair.html.tmpl
@@ -28,7 +28,7 @@
   #   entered a comment along with their change) or a number less than that
   #   (if they didn't), in which case no comments are displayed.
   # comments: array; all the comments on the bug.
-  # bug_id: number; the ID of the bug being changed.
+  # bug: Bugzilla::Bug; the bug being changed.
   #%]
 
 [%# The global Bugzilla->cgi object is used to obtain form variable values. %]
@@ -45,7 +45,7 @@
 
 <p>
   Someone else has made changes to
-  [%+ "$terms.bug $bug_id" FILTER bug_link(bug_id) FILTER none %]
+  [%+ "$terms.bug $bug.id" FILTER bug_link(bug.id) FILTER none %]
   at the same time you were trying to.
   The changes made were:
 </p>
@@ -58,7 +58,7 @@
 <p>
   Added the comment(s):
   <blockquote>
-    [% PROCESS "bug/comments.html.tmpl" bug = { 'bug_id' => bug_id } %]
+    [% PROCESS "bug/comments.html.tmpl" %]
   </blockquote>
 </p>
 [% END %]
@@ -77,7 +77,10 @@ You have the following choices:
 <ul>
   <li>
     <form method="post" action="process_bug.cgi">
-      [% PROCESS "global/hidden-fields.html.tmpl" exclude="^Bugzilla_(login|password)$" %]
+      <input type="hidden" name="delta_ts" 
+             value="[% bug.delta_ts FILTER html %]">
+      [% PROCESS "global/hidden-fields.html.tmpl" 
+          exclude="^Bugzilla_login|Bugzilla_password|delta_ts$" %]
       <input type="submit" id="process" value="Submit my changes anyway">
         This will cause all of the above changes to be overwritten
         [% ", except for the added comment(s)" IF comments.size > start_at %].
@@ -85,7 +88,7 @@ You have the following choices:
   </li>
   <li>
     Throw away my changes, and
-    [%+ "revisit $terms.bug $bug_id" FILTER bug_link(bug_id) FILTER none %]
+    [%+ "revisit $terms.bug $bug.id" FILTER bug_link(bug.id) FILTER none %]
   </li>
 </ul>
 
-- 
cgit v1.2.1