Access field properties more savely

barbeque/templates/barbeque/forms/field/checkboxselectmultiple.html

@@ -1,10 +1,17 @@
+{% load barbeque_tags %}
+
+
 {% block choices %}
 	<ul>
 		{% for group_name, choices in optgroups %}
 			{% for choice in choices %}
 				{% block choice %}
+					{% if field.widget %}
+						{% set errors=field.errors %}
+					{% endif %}
+
 					<li>
-						<label class="form-field-checkboxinput{% if field.errors %} has-errors{% endif %}" for="{{ attrs.id }}_{{ forloop.counter }}">
+						<label class="form-field-checkboxinput{% if errors %} has-errors{% endif %}" for="{{ attrs.id }}_{{ forloop.counter }}">
 							{% block field %}
 								<input
 									{% if choice.0 in value %}checked="checked"{% endif %}

barbeque/templates/barbeque/forms/field/radioselect.html

@@ -1,10 +1,17 @@
+{% load barbeque_tags %}
+
+
 {% block choices %}
 	<ul>
 		{% for group_name, choices in optgroups %}
 			{% for choice in choices %}
 				{% block choice %}
+					{% if field.widget %}
+						{% set errors=field.errors %}
+					{% endif %}
+
 					<li>
-						<label class="form-field-radioselect{% if field.errors %} has-errors{% endif %}" for="{{ attrs.id }}_{{ forloop.counter }}">
+						<label class="form-field-radioselect{% if errors %} has-errors{% endif %}" for="{{ attrs.id }}_{{ forloop.counter }}">
 							{% block field %}
 								<input
 									{% if choice.0 in value %}checked="checked"{% endif %}

barbeque/templates/barbeque/forms/field/selectdatewidget.html

@@ -1,7 +1,13 @@
+{% load barbeque_tags %}
 {% load i18n %}
 
+
+{% if field.widget %}
+	{% set errors=field.errors %}
+{% endif %}
+
 {% block day %}
-	<label for="{{ day_id }}" class="form-field-select form-field-day{% if field.errors %} has-errors{% endif %}">
+	<label for="{{ day_id }}" class="form-field-select form-field-day{% if errors %} has-errors{% endif %}">
 		{% block day_inner %}
 			<span class="label">{% block day_label %}{% trans 'Day' %}{% endblock %}</span>
 			<span class="field">
@@ -21,7 +27,7 @@
 {% endblock %}
 
 {% block month %}
-	<label for="{{ month_id }}" class="form-field-select form-field-month{% if field.errors %} has-errors{% endif %}">
+	<label for="{{ month_id }}" class="form-field-select form-field-month{% if errors %} has-errors{% endif %}">
 		{% block month_inner %}
 			<span class="label">{% block month_label %}{% trans 'Month' %}{% endblock %}</span>
 			<span class="field">
@@ -41,7 +47,7 @@
 {% endblock %}
 
 {% block year %}
-	<label for="{{ year_id }}" class="form-field-select form-field-year{% if field.errors %} has-errors{% endif %}">
+	<label for="{{ year_id }}" class="form-field-select form-field-year{% if errors %} has-errors{% endif %}">
 		{% block year_inner %}
 			<span class="label">{% block year_label %}{% trans 'Year' %}{% endblock %}</span>
 			<span class="field">

barbeque/templates/barbeque/forms/row/default.html

@@ -3,20 +3,27 @@
 
 
 {% block row %}
-	<div class="{{ form.row_classname }}">
+	{% if form.row_classname %}
+		{% set row_classname=form.row_classname %}
+	{% endif %}
+
+	<div class="{{ row_classname }}">
 		{% for field in fields %}
-			{% set name=name|default:field.name %}
-			{% set label=label|default:field.label %}
-			{% set help_text=help_text|default:field.help_text %}
-			{% set errors=errors|default:field.errors %}
-			{% set required=required|default:field.field.required %}
-			{% set classes=classes|default:field.css_classes %}
-			{% set type=type|default:field.field.widget.widget_type %}
+			{% if field.widget %}
+				{% set name=field.name %}
+				{% set label=field.label %}
+				{% set help_text=field.help_text %}
+				{% set errors=errorsfield.errors %}
+				{% set required=field.required %}
+				{% set css_classes=field.css_classes %}
+				{% set type=field.field.widget.widget_type %}
+				{% set field_id=field|id %}
+			{% endif %}
 
 
 			<label
 				class="form-field-{{ type }} has-name-{{ name|slugify }}{{ required|yesno:' is-required,' }}{% if errors %} has-errors{% endif %}{% if classes %} {{ classes }}{% endif %}"
-				for="{{ field|id }}">
+				for="{{ field_id }}">
 
 				{% if type == 'checkboxinput' %}
 					<span class="field">