From 0f8c3b36ac6c26b36f2d8804f24871f10eb67d93 Mon Sep 17 00:00:00 2001
From: Gert <gert@Gerts-MacBook-Pro.local>
Date: Wed, 13 May 2015 15:17:02 +0200
Subject: [PATCH] fix taxonomy field to save as array

---
 themes/grav/js/admin-all.js                      | 16 ++++++++++++++--
 .../forms/fields/select/select.html.twig         |  5 +++--
 .../forms/fields/taxonomy/taxonomy.html.twig     | 10 ++++++----
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/themes/grav/js/admin-all.js b/themes/grav/js/admin-all.js
index 84bdb1aa..8f692825 100644
--- a/themes/grav/js/admin-all.js
+++ b/themes/grav/js/admin-all.js
@@ -6,8 +6,20 @@ $(function () {
     };
 
     // selectize
-    $('select.fancy').selectize({
-        createOnBlur: true
+    $('select.fancy:not(.create)').selectize({
+        createOnBlur: true,
+    });
+
+    // selectize with create
+    $('select.fancy.create').selectize({
+        createOnBlur: true,
+        persist:   false,
+        create:    function (input) {
+            return {
+                value: input,
+                text:  input
+            }
+        }
     });
 
     $('input.fancy').selectize({
diff --git a/themes/grav/templates/forms/fields/select/select.html.twig b/themes/grav/templates/forms/fields/select/select.html.twig
index 5fe23252..13cd7571 100644
--- a/themes/grav/templates/forms/fields/select/select.html.twig
+++ b/themes/grav/templates/forms/fields/select/select.html.twig
@@ -13,13 +13,14 @@
     </div>
     <div class="form-data block size-2-3 pure-u-2-3">
         <div class="form-select-wrapper {{ field.size }}">
-            <select class="{{ field.classes }}" name="{{ (scope ~ field.name)|fieldName }}"
+            <select class="{{ field.classes }}" name="{{ (scope ~ field.name)|fieldName ~ (field.multiple ? '[]' : '') }}"
                     {% if field.autofocus in ['on', 'true', 1] %}autofocus="autofocus"{% endif %}
                     {% if field.novalidate in ['on', 'true', 1] %}novalidate="novalidate"{% endif %}
                     {% if field.validate.required in ['on', 'true', 1] %}required="required"{% endif %}
+                    {% if field.multiple in ['on', 'true', 1] %}multiple="multiple"{% endif %}
                     >
                 {% for key, text in field.options %}
-                <option {% if key == value %}selected="selected"{% endif %} value="{{ key }}">{{ text }}</option>
+                <option {% if key == value or text in value %}selected="selected"{% endif %} value="{{ key }}">{{ text }}</option>
                 {% endfor %}
             </select>
         </div>
diff --git a/themes/grav/templates/forms/fields/taxonomy/taxonomy.html.twig b/themes/grav/templates/forms/fields/taxonomy/taxonomy.html.twig
index f16e83a5..97cdaaf4 100644
--- a/themes/grav/templates/forms/fields/taxonomy/taxonomy.html.twig
+++ b/themes/grav/templates/forms/fields/taxonomy/taxonomy.html.twig
@@ -2,13 +2,15 @@
 {% set parentname = field.name %}
 {% for name in taxonomies %}
 
+    {% set value = data.value('header.taxonomy.' ~ name) %}
     {% set field = {
         type: 'text',
-        classes: 'fancy',
+        classes: 'fancy create',
         label: name|capitalize,
-        name: parentname ~ '.' ~ name
+        name: parentname ~ '.' ~ name,
+        multiple: true,
+        options: value
     } %}
-    {% set value = data.value('header.taxonomy.' ~ name) %}
 
-    {% include ['forms/fields/text/text.html.twig'] %}
+    {% include ['forms/fields/select/select.html.twig'] %}
 {% endfor %}