diff --git a/CHANGELOG.md b/CHANGELOG.md index 18c16afa..6674cac7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # v1.4.3 ## 04/xx/2017 +1. [](#new) + * Add support for a single array field in the forms 1. [](#improved) * Improved full-screen editor for better browser compatibility [#1093](https://github.com/getgrav/grav-plugin-admin/pull/1093) * Added ability to choose how you want the preview button to open [#1096](https://github.com/getgrav/grav-plugin-admin/pull/1096) diff --git a/themes/grav/templates/config.html.twig b/themes/grav/templates/config.html.twig index 75315de2..ebde646f 100644 --- a/themes/grav/templates/config.html.twig +++ b/themes/grav/templates/config.html.twig @@ -49,7 +49,7 @@ {% for configuration in admin.configurations %} {% if authorize(['admin.configuration_' ~ configuration, 'admin.super']) %} {% set current_blueprints = admin.data('config/' ~ configuration).blueprints.toArray() %} - {% if configuration != 'system' and configuration != 'site' and not current_blueprints.form.hidden and current_blueprints.form.fields is not empty %} + {% if configuration != 'system' and configuration != 'site' and not current_blueprints.form.hidden and (current_blueprints.form.fields is not empty or current_blueprints.form.field is not empty) %} {% set configuration_string = "PLUGIN_ADMIN." ~ configuration|upper %} {{ (configuration_string|tu == configuration_string ? configuration|capitalize : configuration_string|tu) }} diff --git a/themes/grav/templates/forms/fields/column/column.html.twig b/themes/grav/templates/forms/fields/column/column.html.twig index 451a289e..3b699d84 100644 --- a/themes/grav/templates/forms/fields/column/column.html.twig +++ b/themes/grav/templates/forms/fields/column/column.html.twig @@ -2,7 +2,7 @@
{% for field in field.fields %} {% if field.type %} - {% set value = data.value(field.name) %} + {% set value = field.name ? data.value(field.name) : data.toArray %} {% include ["forms/fields/#{field.type}/#{field.type}.html.twig", 'forms/fields/text/text.html.twig'] %} {% endif %} {% endfor %} diff --git a/themes/grav/templates/forms/fields/fieldset/fieldset.html.twig b/themes/grav/templates/forms/fields/fieldset/fieldset.html.twig index 0a3d9e6b..0453f6d1 100644 --- a/themes/grav/templates/forms/fields/fieldset/fieldset.html.twig +++ b/themes/grav/templates/forms/fields/fieldset/fieldset.html.twig @@ -55,7 +55,7 @@ {% if field.fields %} {% for field in field.fields %} {% if field.type %} - {% set value = data.value(field.name) %} + {% set value = field.name ? data.value(field.name) : data.toArray %} {% include ["forms/fields/#{field.type}/#{field.type}.html.twig", 'forms/fields/text/text.html.twig'] %} {% endif %} {% endfor %} diff --git a/themes/grav/templates/forms/fields/section/section.html.twig b/themes/grav/templates/forms/fields/section/section.html.twig index 73c77d61..6cacc001 100644 --- a/themes/grav/templates/forms/fields/section/section.html.twig +++ b/themes/grav/templates/forms/fields/section/section.html.twig @@ -12,7 +12,7 @@
{% for field in field.fields %} {% if field.type %} - {% set value = data.value(field.name) %} + {% set value = field.name ? data.value(field.name) : data.toArray %} {% include ["forms/fields/#{field.type}/#{field.type}.html.twig", 'forms/fields/text/text.html.twig'] %} {% endif %} {% endfor %} diff --git a/themes/grav/templates/forms/fields/tab/tab.html.twig b/themes/grav/templates/forms/fields/tab/tab.html.twig index 0c7c8e70..0b76b831 100644 --- a/themes/grav/templates/forms/fields/tab/tab.html.twig +++ b/themes/grav/templates/forms/fields/tab/tab.html.twig @@ -2,8 +2,8 @@
{% for field in field.fields %} {% if field.type %} - {% set value = data.value(field.name) %} - {% include ["forms/fields/#{field.type}/#{field.type}.html.twig", 'forms/fields/text/text.html.twig'] %} + {% set value = field.name ? data.value(field.name) : data.toArray %} + {% include ["forms/fields/#{field.type}/#{field.type}.html.twig", 'forms/fields/text/text.html.twig'] %} {% endif %} {% endfor %}
diff --git a/themes/grav/templates/forms/fields/tabs/tabs.html.twig b/themes/grav/templates/forms/fields/tabs/tabs.html.twig index 9162bbc5..73495eba 100644 --- a/themes/grav/templates/forms/fields/tabs/tabs.html.twig +++ b/themes/grav/templates/forms/fields/tabs/tabs.html.twig @@ -31,7 +31,7 @@ {% for field in field.fields %} {% if field.type == 'tab' %} {% if field.security is empty or authorize(array(field.security)) %} - {% set value = data.value(field.name) %} + {% set value = field.name ? data.value(field.name) : data.toArray %}
{% include ["forms/fields/#{field.type}/#{field.type}.html.twig", 'forms/fields/text/text.html.twig'] %}
diff --git a/themes/grav/templates/partials/blueprints-new-folder.html.twig b/themes/grav/templates/partials/blueprints-new-folder.html.twig index 0f54ff63..918d0683 100644 --- a/themes/grav/templates/partials/blueprints-new-folder.html.twig +++ b/themes/grav/templates/partials/blueprints-new-folder.html.twig @@ -4,7 +4,7 @@
{% for field in blueprints.fields %} {% if field.type %} - {% set value = data.value(field.name) %} + {% set value = field.name ? data.value(field.name) : data.toArray %}
{% include ["forms/fields/#{field.type}/#{field.type}.html.twig", 'forms/fields/text/text.html.twig'] %}
diff --git a/themes/grav/templates/partials/blueprints-new.html.twig b/themes/grav/templates/partials/blueprints-new.html.twig index 6e965d57..1ac3f186 100644 --- a/themes/grav/templates/partials/blueprints-new.html.twig +++ b/themes/grav/templates/partials/blueprints-new.html.twig @@ -4,7 +4,7 @@ {% for field in blueprints.fields %} {% if field.type %} - {% set value = data.value(field.name) %} + {% set value = field.name ? data.value(field.name) : data.toArray %}
{% include ["forms/fields/#{field.type}/#{field.type}.html.twig", 'forms/fields/text/text.html.twig'] %}
diff --git a/themes/grav/templates/partials/blueprints-raw.html.twig b/themes/grav/templates/partials/blueprints-raw.html.twig index 72937250..9ccaff82 100644 --- a/themes/grav/templates/partials/blueprints-raw.html.twig +++ b/themes/grav/templates/partials/blueprints-raw.html.twig @@ -4,7 +4,7 @@ {% for field in blueprints.fields %} {% if field.type %} - {% set value = data.value(field.name) %} + {% set value = field.name ? data.value(field.name) : data.toArray %}
{% include ["forms/fields/#{field.type}/#{field.type}.html.twig", 'forms/fields/text/text.html.twig'] %} diff --git a/themes/grav/templates/partials/page-move.html.twig b/themes/grav/templates/partials/page-move.html.twig index 4f1fc904..7678c3e8 100644 --- a/themes/grav/templates/partials/page-move.html.twig +++ b/themes/grav/templates/partials/page-move.html.twig @@ -4,7 +4,7 @@ {% for field in blueprints.fields %} {% if field.type %} - {% set value = data.value(field.name) %} + {% set value = field.name ? data.value(field.name) : data.toArray %}
{% include ["forms/fields/#{field.type}/#{field.type}.html.twig", 'forms/fields/text/text.html.twig'] %}