Fixed elements field when it's used inside list field

This commit is contained in:
Matias Griese
2022-02-03 20:14:20 +02:00
parent a4ca62e2ef
commit 9f3bcd11b1
4 changed files with 16 additions and 7 deletions

View File

@@ -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

View File

@@ -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' }

View File

@@ -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 %}
<div id="{{ parent_name ~ '__' ~ field.name|string }}" class="form-element" style="{{ initial_state }}">

View File

@@ -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 %}