From 7c0b9e7f84e5f10adc9df3a2590eef6d266b673a Mon Sep 17 00:00:00 2001
From: "lpsolit%gmail.com" <>
Date: Thu, 18 Jan 2007 06:27:09 +0000
Subject: Bug 299405: Attachments don't work if you need to log in again [
 Undefined subroutine @ Fh::slice ] - Patch by Frédéric Buclin
 <LpSolit@gmail.com> r/a=justdave
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../en/default/global/confirm-user-match.html.tmpl |  5 +++++
 template/en/default/global/hidden-fields.html.tmpl | 22 ++++++++++++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

(limited to 'template/en/default/global')

diff --git a/template/en/default/global/confirm-user-match.html.tmpl b/template/en/default/global/confirm-user-match.html.tmpl
index 8fb20e070..35ec93f74 100644
--- a/template/en/default/global/confirm-user-match.html.tmpl
+++ b/template/en/default/global/confirm-user-match.html.tmpl
@@ -42,10 +42,15 @@
 [% IF matchsuccess == 1 %]
   [% PROCESS global/header.html.tmpl title="Confirm Match" %]
 
+[% USE Bugzilla %]
+
   <form method="post" 
   [% IF script -%]
     action="[% script %]"
   [%- END -%]
+  [% IF Bugzilla.cgi.param("data") %]
+    enctype="multipart/form-data"
+  [% END %]
   >
 
   <p>
diff --git a/template/en/default/global/hidden-fields.html.tmpl b/template/en/default/global/hidden-fields.html.tmpl
index 7327e43cf..063cdd33b 100644
--- a/template/en/default/global/hidden-fields.html.tmpl
+++ b/template/en/default/global/hidden-fields.html.tmpl
@@ -34,8 +34,26 @@
   [%# The '.slice(0)' bit is here to force the 'param(field)' to be evaluated
       in a list context, so we can avoid extra code checking for single valued or
       empty fields %]
-  [% FOREACH mvalue = cgi.param(field).slice(0) %]
-    <input type="hidden" name="[% field FILTER html %]"
+  [% IF field == "data" && cgi.param("data") %]
+    <div class="box">
+      <p>
+        We were unable to store the file you uploaded because of incomplete information
+        in the form you just submitted. Because we are unable to retain the file between
+        form submissions, you must re-attach the file in addition to completing the
+        remaining missing information above.
+      </p>
+      <p>
+        Please re-attach the file <b>[% cgi.param(field) FILTER html %]</b> in
+        the field below:
+      </p>
+      <p>
+        <input type="file" id="data" name="data" size="50">
+      </p>
+    </div>
+  [% ELSE %]
+    [% FOREACH mvalue = cgi.param(field).slice(0) %]
+      <input type="hidden" name="[% field FILTER html %]"
              value="[% mvalue FILTER html FILTER html_linebreak %]">
     [% END %]
+  [% END %]
 [% END %]
-- 
cgit v1.2.3-24-g4f1b