From 1b6fa222461694de3412383c423b4f7a613a18be Mon Sep 17 00:00:00 2001
From: Aron Carroll <self@aroncarroll.com>
Date: Wed, 1 Aug 2012 11:32:48 +0100
Subject: [PATCH] [#2765] Allow error=true to be passed to a form macro

This highlights the error field without a message. Also fixed the
error_summary display to exclude the key if missing.
---
 ckan/templates/macros/form.html | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/ckan/templates/macros/form.html b/ckan/templates/macros/form.html
index c81b61095cf..6cb6e226a6f 100644
--- a/ckan/templates/macros/form.html
+++ b/ckan/templates/macros/form.html
@@ -8,7 +8,7 @@
 value       - The value of the input.
 placeholder - Some placeholder text.
 type        - The type of input eg. email, url, date (default: text).
-error       - A list of error strings for the field.
+error       - A list of error strings for the field or just true to highlight the field.
 classes     - An array of classes to apply to the control-group.
 
 Examples:
@@ -34,7 +34,7 @@
 label       - The human readable label.
 value       - The value of the input.
 checked     - If true the checkbox will be checked
-error       - An error string for the field.
+error       - An error string for the field or just true to highlight the field.
 classes     - An array of classes to apply to the control-group.
 
 Example:
@@ -49,7 +49,7 @@
       <label class="checkbox" for="{{ id or name }}">
         <input id="{{ id or name }}" type="checkbox" name="{{ name }}" value="{{ value | empty_and_escape }}" {{ "checked " if checked }} {{ attributes(attrs) }} />
         {{ label or name }}
-        {% if error %}<strong class="error-inline">{{ error|join(', ') }}</strong>{% endif %}
+        {% if error is iterable %}<strong class="error-inline">{{ error|join(', ') }}</strong>{% endif %}
       </label>
     </div>
   </div>
@@ -68,7 +68,7 @@
 label       - The human readable label.
 options     - A list/tuple of fields to be used as <options>.
 selected    - The value of the selected <option>.
-error       - A list of error strings for the field.
+error       - A list of error strings for the field or just true to highlight the field.
 classes     - An array of classes to apply to the control-group.
 
 Examples:
@@ -99,7 +99,7 @@
 label       - The human readable label.
 value       - The value of the input.
 placeholder - Some placeholder text.
-error       - A list of error strings for the field.
+error       - A list of error strings for the field or just true to highlight the field.
 classes     - An array of classes to apply to the control-group.
 
 Examples:
@@ -130,7 +130,7 @@
 value       - The value of the input.
               which will use the name key as the value.
 placeholder - Some placeholder text.
-error       - A list of error strings for the field.
+error       - A list of error strings for the field  or just true to highlight the field.
 classes     - An array of classes to apply to the control-group.
 
 Examples:
@@ -165,7 +165,7 @@
 values      - A tuple of values for the (key, value, delete) fields. If delete
               is truthy the checkbox will be checked.
 placeholder - A tuple of placeholder text for the (key, value) fields.
-error       - A list of error strings for the field.
+error       - A list of error strings for the field or just true to highlight the field.
 classes     - An array of classes to apply to the control-group.
 
 Examples:
@@ -204,7 +204,7 @@
 
 for     - The id for the input that the label should match.
 label   - A human readable label.
-error   - A list of error strings for the field.
+error   - A list of error strings for the field or just true.
 classes - An array of custom classes for the outer element.
 control_classes - An array of custom classes for the .control wrapper.
 
@@ -221,7 +221,7 @@
     <label class="control-label" for="{{ for }}">{{ label or _('Custom') }}</label>
     <div class="controls{{ " " ~ control_classes | join(' ') }}">
       {{ caller() }}
-      {% if error %}<span class="error-block">{{ error|join(', ') }}</span>{% endif %}
+      {% if error is iterable %}<span class="error-block">{{ error|join(', ') }}</span>{% endif %}
     </div>
   </div>
 {% endmacro %}
@@ -245,7 +245,7 @@
       <p>{{ _('The form contains invalid entries:') }}</p>
       <ul>
         {% for key, error in errors.items() %}
-          <li data-field-label="{{ key }}">{{ key }}: {{ error }}</li>
+          <li data-field-label="{{ key }}">{% if key %}{{ key }}: {% endif %}{{ error }}</li>
         {% endfor %}
       </ul>
     </div>