From 25d74994c6bc088b41e15555adde6b629c465f60 Mon Sep 17 00:00:00 2001 From: Aron Carroll Date: Mon, 30 Jul 2012 11:41:00 +0100 Subject: [PATCH] [#2767] Update other instances of form.select() to use lists --- ckan/templates/development/snippets/form.html | 2 +- ckan/templates/package/snippets/resource_form.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ckan/templates/development/snippets/form.html b/ckan/templates/development/snippets/form.html index 088f92bed98..63b397dcc1e 100644 --- a/ckan/templates/development/snippets/form.html +++ b/ckan/templates/development/snippets/form.html @@ -20,7 +20,7 @@ values=('key', 'value', true), error=error ) }} {{ form.markdown('desc', id='field-description', label=_('Markdown'), placeholder='Some nice placeholder text', error=error) }} - {{ form.select('year', label=_('Select'), options={2010: 2010, 2011: 2011}, selected=2011, error=error) }} + {{ form.select('year', label=_('Select'), options=[{'value': 2010}, {'value': 2011}], selected=2011, error=error) }} {{ form.checkbox('remember', label="This is my checkbox", checked=true, error=error) }} diff --git a/ckan/templates/package/snippets/resource_form.html b/ckan/templates/package/snippets/resource_form.html index 67cf8ee23c6..c87b7961514 100644 --- a/ckan/templates/package/snippets/resource_form.html +++ b/ckan/templates/package/snippets/resource_form.html @@ -47,7 +47,7 @@ {% block metadata_fields %} {% if include_metadata %} {# TODO: Where do these come from, they don't exist in /package/new_package_form.html #} - {# {{ form.select('resource_type', id='field-type', label=_('Resource Type'), options={empty: _('Select a type…')}, selected="empty", error=errors.type) }} #} + {# {{ form.select('resource_type', id='field-type', label=_('Resource Type'), options=[{'value': 'empty', 'text': _('Select a type…')}], selected="empty", error=errors.type) }} #} {{ form.input('last_modified', id='field-last-modified', label=_('Last Modified'), placeholder=_('eg. 2012-06-05'), value=data.last_modified, error=errors.last_modified, classes=[]) }}