Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix radio inputs #8

Merged
merged 1 commit into from
Oct 14, 2015
Merged

Fix radio inputs #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion templates/forms/fields/checkboxes/checkboxes.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
{% block input %}
{% for key, text in field.options %}

{% set id = field.name ~ '-' ~ key %}
{% set id = field.id|default(field.name) ~ '-' ~ key %}
{% set name = field.use == 'keys' ? key : id %}
{% set val = field.use == 'keys' ? '1' : key %}
{% set checked = (field.use == 'keys' ? value[key] : key in value) %}
Expand Down
18 changes: 3 additions & 15 deletions templates/forms/fields/radio/radio.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,16 @@

{% set originalValue = value %}
{% set value = (value is null ? field.default : value) %}
{% if field.use == 'keys' and field.default %}
{% set value = field.default|merge(value) %}
{% endif %}

{% block global_attributes %}
{{ parent() }}
data-grav-keys="{{ field.use == 'keys' ? 'true' : 'false' }}"
data-grav-field-name="{{ field.name|fieldName }}"
{% endblock %}

{% block input %}
{% for key, text in field.options %}
{% set id = "radio_" ~ field.name ~ key %}
{% set name = field.use == 'keys' ? key : id %}
{% set val = field.use == 'keys' ? '1' : key %}
{% set checked = (field.use == 'keys' ? value[key] : key in value) %}
{% set id = field.id|default(field.name) ~ '-' ~ key %}

<span class="radio">
<input type="radio"
value="{{ val|e }}"
value="{{ key|e }}"
id="{{ id|e }}"
name="{{ field.name|fieldName ~ '[' ~ name ~ ']' }}"
name="{{ field.name|fieldName }}"
{% if key == value %}checked="checked" {% endif %}
{% if field.validate.required in ['on', 'true', 1] %}required="required"{% endif %}
/>
Expand Down