Allow for multiple selects

ckanext/odsh/templates/macros/form.html

@@ -163,10 +163,9 @@ is_required=false) %}
 {% endmacro %}
 
 
-{# 
-Creates a select with an input field for autocomplete #}
+{# Creates a select with an input field for autocomplete #}
 {% macro select_autocomplete(name, id='', label='', options='', selected='', error='', classes=[],  attrs={},
-    is_required=false) %}
+    is_required=false, is_multiple=false) %}
 {% set classes = (classes|list) %}
 {% do classes.append('control-select') %}
 
@@ -176,9 +175,9 @@ Creates a select with an input field for autocomplete #}
 
 <div class="row-fluid">
     <div class="span6">
-        <select id="{{ id or name }}" name="{{ name }}" {{ attributes(attrs) }} data-module="autocomplete">
+        <select id="{{ id or name }}" name="{{ name }}" {{ attributes(attrs) }} data-module="autocomplete" {% if is_multiple %} multiple {% endif %}>
             {% for option in options %}
-                <option value="{{ option.key }}" {% if option.key==selected %} selected {% endif %}>{{ option.text or
+                <option value="{{ option.key }}" {% if option.key in selected %} selected {% endif %}>{{ option.text or
                 option.value }} </option>
             {% endfor %}
         </select>
@@ -195,6 +194,7 @@ Creates a select with an input field for autocomplete #}
 {% endmacro %}
 
 
+
 {#
 Creates all the markup required for a Markdown textarea element. Handles
 matching labels to inputs, selected item and error messages.

ckanext/odsh/templates/package/snippets/package_basic_fields.html

@@ -352,10 +352,10 @@ dataset_is_draft)) %}
 {% set field = 'applicableLegislation' %}
 {% set error_reference = h.odsh_extract_error(field, errors) %}
 {% set value = h.odsh_extract_value_from_extras(data.extras,field) or '' %}
-{{ form.select_autocomplete(field, label=_('Applicable Legislation'), selected=value, options=h.odsh_load_applicable_legislations(), error=error_reference, is_required=False, classes=['control-full', 'field-applicableLegislation'])}}
+{{ form.select_autocomplete(field, label=_('Applicable Legislation'), selected=value, options=h.odsh_load_applicable_legislations(), error=error_reference, is_required=False, classes=['control-full', 'field-applicableLegislation'], is_multiple=True)}}
 
 {# field hvdCategory #}
 {% set field = 'hvdCategory' %}
 {% set error_reference = h.odsh_extract_error(field, errors) %}
 {% set value = h.odsh_extract_value_from_extras(data.extras,field) or '' %}
-{{ form.select_autocomplete(field, label=_('HVD Category'), selected=value, options=h.odsh_load_hvd_categories(), error=error_reference, is_required=False, classes=['control-full', 'field-hvdCategory'])}}
+{{ form.select_autocomplete(field, label=_('HVD Category'), selected=value, options=h.odsh_load_hvd_categories(), error=error_reference, is_required=False, classes=['control-full', 'field-hvdCategory'], is_multiple=True)}}