Skip to content

Commit

Permalink
[#2375] fix broke errors list -> string
Browse files Browse the repository at this point in the history
  • Loading branch information
tobes committed Jun 26, 2012
1 parent c98d049 commit 29a01d2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion ckan/templates/development/primer.html
Expand Up @@ -30,7 +30,7 @@
{% snippet 'development/snippets/simple-input.html', heading='Facet List', show_icons=true %}

{% snippet 'development/snippets/form.html' %}
{% snippet 'development/snippets/form.html', error='This field has an error' %}
{% snippet 'development/snippets/form.html', error=['This field has an error'] %}

<section class="module">
<div class="module-content">
Expand Down
6 changes: 3 additions & 3 deletions ckan/templates/macros/form.html
Expand Up @@ -46,7 +46,7 @@
<label class="checkbox" for="{{ id or name }}">
<input id="{{ id or name }}" type="checkbox" name="{{ name }}" value="{{ value | e }}" {{ "checked " if checked }}{{ attributes(attrs) }} />
{{ label or name }}
{% if error %}<strong class="error-inline">{{ error }}</strong>{% endif %}
{% if error %}<strong class="error-inline">{{ error|join(', ') }}</strong>{% endif %}
</label>
</div>
</div>
Expand Down Expand Up @@ -140,7 +140,7 @@
<div class="input-prepend">
{% if prepend %}<span class="add-on">{{ prepend }}</span>{%- endif -%}
<input id="{{ id or name }}" type="{{ type }}" name="{{ name }}" value="{{ value | e }}" placeholder="{{ placeholder }}" />
{% if error %}<span class="error-block">{{ error }}</span>{% endif %}
{% if error %}<span class="error-block">{{ error|join(', ') }}</span>{% endif %}
</div>
{% endcall %}
{% endmacro %}
Expand Down Expand Up @@ -214,7 +214,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 }}</span>{% endif %}
{% if error %}<span class="error-block">{{ error|join(', ') }}</span>{% endif %}
</div>
</div>
{% endmacro %}
Expand Down

0 comments on commit 29a01d2

Please sign in to comment.