diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d81e793..f085cc43 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,17 +1,25 @@ +# v1.10.30 +## mm/dd/2022 + +1. [](#new) + * Require **Grav 1.7.30** +1. [](#bugfix) + * Fixed `elements` field when it's used inside `list` field + # v1.10.29 ## 01/28/2022 1. [](#new) * Require **Grav 1.7.29** 3. [](#improved) - * Made path handling unicode-safe, use new `Utils::basename()` and `Utils::pathinfo()` everywhere + * Made path handling unicode-safe, use new `Utils::basename()` and `Utils::pathinfo()` everywhere # v1.10.28 ## 01/24/2022 1. [](#bugfix) - * Clean file names before displaying errors/metadata modals - * Recompiled JS for production [#2225](https://github.com/getgrav/grav-plugin-admin/issues/2225) + * Clean file names before displaying errors/metadata modals + * Recompiled JS for production [#2225](https://github.com/getgrav/grav-plugin-admin/issues/2225) # v1.10.27 ## 01/12/2022 diff --git a/blueprints.yaml b/blueprints.yaml index c47983af..62e7f7d4 100644 --- a/blueprints.yaml +++ b/blueprints.yaml @@ -15,7 +15,7 @@ docs: https://github.com/getgrav/grav-plugin-admin/blob/develop/README.md license: MIT dependencies: - - { name: grav, version: '>=1.7.29' } + - { name: grav, version: '>=1.7.30' } - { name: form, version: '>=5.1.0' } - { name: login, version: '>=3.6.2' } - { name: email, version: '>=3.1.0' } diff --git a/themes/grav/templates/forms/fields/element/element.html.twig b/themes/grav/templates/forms/fields/element/element.html.twig index df6b75cb..cf840023 100644 --- a/themes/grav/templates/forms/fields/element/element.html.twig +++ b/themes/grav/templates/forms/fields/element/element.html.twig @@ -1,7 +1,9 @@ {% extends "forms/field.html.twig" %} {% block field %} - {% embed 'forms/default/fields.html.twig' with {name: field.name, fields: field.fields} %} + {% set name = parent_name|field_parent ~ '.' ~ field.name %} + {% set fields = prepare_form_fields(field.fields, name) %} + {% embed 'forms/default/fields.html.twig' with {name: name, fields: fields} %} {% set initial_state = field.name|string is not same as (parent_value|string) ? 'display: none;' %} {% block outer_markup_field_open %}
diff --git a/themes/grav/templates/forms/fields/elements/elements.html.twig b/themes/grav/templates/forms/fields/elements/elements.html.twig index b50c5bae..7d1e67c0 100644 --- a/themes/grav/templates/forms/fields/elements/elements.html.twig +++ b/themes/grav/templates/forms/fields/elements/elements.html.twig @@ -14,8 +14,7 @@ {{ parent() }} {% set parent_name = field.name %} {% set parent_value = value %} - {% set fields = prepare_form_fields(field.fields, field.name) %} {% if fields|length %} - {% include 'forms/default/fields.html.twig' with {name: field.name, fields: fields} %} + {% include 'forms/default/fields.html.twig' with {name: parent_name, fields: field.fields} %} {% endif %} {% endblock %}