Turning {{ form_html }} variable into an attribute of the form, so it…

…'s more consistent with the formset situation.
DanielKotik · May 19, 2011 · aae9e24 · aae9e24
1 parent 8bc66a5
commit aae9e24
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/uni_form/templates/uni_form/whole_uni_form.html b/uni_form/templates/uni_form/whole_uni_form.html
@@ -3,9 +3,9 @@
  {% csrf_token %}
  {% endif %}
 
- {% if form_html %}
+ {% if form.form_html %}
  {% include "uni_form/errors.html" %}
- {{ form_html }}
+ {{ form.form_html }}
  {% else %}
  {% include "uni_form/uni_form.html" %}
  {% endif %}

diff --git a/uni_form/templatetags/uni_form_tags.py b/uni_form/templatetags/uni_form_tags.py
@@ -62,13 +62,13 @@ def get_render(self, context):
  is_formset = isinstance(actual_form, BaseFormSet)
  response_dict = self.get_response_dict(attrs, context, is_formset)
 
- # If we have a helper's layout we use it
- form_html = ""
- if helper and helper.layout and not is_formset:
- form_html = helper.render_layout(actual_form, attrs['form_style'])
- elif helper and helper.layout and is_formset:
- for form in actual_form.forms:
- form.form_html = helper.render_layout(form, attrs['form_style'])
+ # If we have a helper's layout we use it, for the form or the formset's form
+ if helper and helper.layout:
+  if not is_formset:
+  actual_form.form_html = helper.render_layout(actual_form, attrs['form_style'])
+  else:
+  for form in actual_form.forms:
+  form.form_html = helper.render_layout(form, attrs['form_style'])
 
  if is_formset:
  response_dict.update({'formset': actual_form})
@@ -77,7 +77,6 @@ def get_render(self, context):
 
  response_dict.update({
  'is_formset': is_formset,
- 'form_html': form_html,
  })
 
  return Context(response_dict)