Nemcio/Grav-Admin-Plugin
1
0
Fork 0
mirror of https://github.com/getgrav/grav-plugin-admin.git synced 2026-05-07 02:26:23 +02:00
Code Issues Packages Projects Releases Activity

Add missing scope parameter for array/toggle form fields

Browse Source
This commit is contained in:
Matias Griese
2016-03-15 21:36:14 +02:00
parent 66c2ef6f75
commit 066c4bcd37
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
themes/grav/templates/forms/field.html.twig
View File

@@ -13,7 +13,7 @@
{% block contents %}
<div class="form-label{% if not vertical %} block size-1-3{% endif %}">
{% if field.toggleable %}
<span class="checkboxes toggleable" data-grav-field="toggleable" data-grav-field-name="{{ field.name|fieldName }}">
<span class="checkboxes toggleable" data-grav-field="toggleable" data-grav-field-name="{{ (scope ~ field.name)|fieldName }}">
<input type="checkbox"
id="toggleable_{{ field.name }}"
{% if toggleableChecked %}value="1"{% endif %}

12
themes/grav/templates/forms/fields/array/array.html.twig
View File

@@ -1,13 +1,13 @@
{% extends "forms/field.html.twig" %}
{% block global_attributes %}
data-grav-array-name="{{ field.name|fieldName }}"
data-grav-array-name="{{ (scope ~ field.name)|fieldName }}"
data-grav-array-keyname="{{ field.placeholder_key|e|tu }}"
data-grav-array-valuename="{{ field.placeholder_value|e|tu }}"
{{ parent() }}
{% endblock %}
{% macro renderer(key, text, field) %}
{% macro renderer(key, text, field, scope) %}
<div class="form-row{% if field.value_only %} array-field-value_only{% endif %}"
data-grav-array-type="row">
{% if field.value_only != true %}
@@ -25,7 +25,7 @@
<input
data-grav-array-type="value"
type="text"
name="{{ (field.name|fieldName) ~ '[' ~ key ~ ']' }}"
name="{{ ((scope ~ field.name)|fieldName) ~ '[' ~ key ~ ']' }}"
placeholder="{{ field.placeholder_value|e|tu }}"
{% if field.disabled or isDisabledToggleable %}disabled="disabled"{% endif %}
value={% if text == 'true' %}true{% elseif text == 'false' %}false{% else %}"{{ text|join(', ')|e }}"{% endif %} />
@@ -41,11 +41,11 @@
{% if value|length %}
{% for key, text in value -%}
{% if text is not iterable %}
{{ array_field.renderer(key, text, field) }}
{{ array_field.renderer(key, text, field, scope) }}
{% else %}
{# Backward compatibility for nested arrays (metas) which are not supported anymore #}
{% for subkey, subtext in text -%}
{{ array_field.renderer(key ~ ':' ~ subkey, subtext, field) }}
{{ array_field.renderer(key ~ ':' ~ subkey, subtext, field, scope) }}
{% endfor %}
{% endif %}
{% endfor %}
@@ -60,7 +60,7 @@
<input
data-grav-array-type="value"
type="text"
name="{{ field.name|fieldName }}"
name="{{ (scope ~ field.name)|fieldName }}"
{% if field.disabled or isDisabledToggleable %}disabled="disabled"{% endif %}
placeholder="{{ field.placeholder_value|e|tu }}" />
<span data-grav-array-action="rem" class="fa fa-minus"></span>

2
themes/grav/templates/forms/fields/toggle/toggle.html.twig
View File

@@ -12,7 +12,7 @@
{% block global_attributes %}
{{ parent() }}
data-grav-field-name="{{ field.name|fieldName }}"
data-grav-field-name="{{ (scope ~ field.name)|fieldName }}"
{% endblock %}
{% macro spanToggle(input, length) %}