Ticket #10557: form_wizard_prev_fields.diff

django/contrib/formtools/wizard.py

@@ -8 +8 @@
 
 from django import forms
 from django.conf import settings
+from django.forms.forms import BoundField
 from django.http import Http404
 from django.shortcuts import render_to_response
 from django.template.context import RequestContext
@@ -102 +103 @@
         old_data = request.POST
         prev_fields = []
         if old_data:
-            hidden = forms.HiddenInput()
-            # Collect all data from previous steps and render it as HTML hidden fields.
+            # Collect all data from previous steps as bound fields.
             for i in range(step):
                 old_form = self.get_form(i, old_data)
                 hash_name = 'hash_%s' % i
-                prev_fields.extend([bf.as_hidden() for bf in old_form])
-                prev_fields.append(hidden.render(hash_name, old_data.get(hash_name, self.security_hash(request, old_form))))
-        return self.render_template(request, form, ''.join(prev_fields), step, context)
+                prev_fields.extend([bf for bf in old_form])
+                hash_field = forms.Field(initial=old_data.get(hash_name,
+                    self.security_hash(request, old_form)))
+                bf = BoundField(forms.Form(), hash_field, hash_name)
+                prev_fields.append(bf)
+        return self.render_template(request, form, prev_fields, step, context)
 
     # METHODS SUBCLASSES MIGHT OVERRIDE IF APPROPRIATE ########################
 

docs/ref/contrib/formtools/form-wizard.txt

@@ -141 +141 @@
 Next, you'll need to create a template that renders the wizard's forms. By
 default, every form uses a template called :file:`forms/wizard.html`. (You can
 change this template name by overriding
-:meth:`~django.contrib.formtools.wizard..get_template()`, which is documented
+:meth:`~django.contrib.formtools.wizard.get_template()`, which is documented
 below. This hook also allows you to use a different template for each form.)
 
 This template expects the following context:
@@ -152 +152 @@
     * ``step_count`` -- The total number of steps.
     * ``form`` -- The :class:`~django.forms.forms.Form` instance for the
       current step (either empty or with errors).
-    * ``previous_fields`` -- A string representing every previous data field,
-      plus hashes for completed forms, all in the form of hidden fields. Note
-      that you'll need to run this through the
-      :meth:`~django.template.defaultfilters.safe` template filter, to prevent
-      auto-escaping, because it's raw HTML.
+    * ``previous_fields`` -- A list containing every previous data field,
+      plus hashes for completed forms, all in the form of regular fields. Note
+      that you'll need to call :meth:`as_hidden` on each field to prevent
+      them from appearing in your forms.
 
 It will also be passed any objects in :data:`extra_context`, which is a
 dictionary you can specify that contains extra values to add to the context.
@@ -182 +181 @@
     {{ form }}
     </table>
     <input type="hidden" name="{{ step_field }}" value="{{ step0 }}" />
-    {{ previous_fields|safe }}
+    {% for field in previous_fields %}{{ field.as_hidden }}{% endfor %}
     <input type="submit">
     </form>
     {% endblock %}