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 #396] Use form_snippets/help_text.html in repeating_subfields.html #397

Merged
merged 1 commit into from
Jan 23, 2024
Merged

[Fix #396] Use form_snippets/help_text.html in repeating_subfields.html #397

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
49 changes: 22 additions & 27 deletions ckanext/scheming/templates/scheming/form_snippets/repeating_subfields.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,37 +55,32 @@
is_required=h.scheming_field_required(field)) %}
<div {{ form.attributes(field.get('form_attrs', {})) }}>
<fieldset name="scheming-repeating-subfields" class="scheming-fieldset" data-module="scheming-repeating-subfields">
{% set alert_warning = h.scheming_language_text(field.form_alert_warning) %}
{% if alert_warning %}
<section class="alert alert-warning">
{{ alert_warning|safe }}
</section>
{% endif %}
{% set alert_warning = h.scheming_language_text(field.form_alert_warning) %}
{% if alert_warning %}
<section class="alert alert-warning">
{{ alert_warning|safe }}
</section>
{% endif %}

{%- set group_data = data[field.field_name] -%}
{%- set group_count = group_data|length -%}
{%- if not group_count and 'id' not in data -%}
{%- set group_count = field.form_blanks|default(1) -%}
{%- endif -%}
{%- set group_data = data[field.field_name] -%}
{%- set group_count = group_data|length -%}
{%- if not group_count and 'id' not in data -%}
{%- set group_count = field.form_blanks|default(1) -%}
{%- endif -%}

<div class="scheming-repeating-subfields-group">
{% for index in range(group_count) %}
{{ repeating_panel(index, index + 1) }}
{% endfor %}
</div>
<div class="control-medium">
{% block add_button %}<a href="javascript:;" name="repeating-add" class="btn btn-link"
>{% block add_button_text %}<i class="fa fa-plus" aria-hidden="true"></i> {{ _('Add') }}{% endblock %}</a>{% endblock %}
<div class="scheming-repeating-subfields-group">
{% for index in range(group_count) %}
{{ repeating_panel(index, index + 1) }}
{% endfor %}
</div>
<div class="control-medium">
{% block add_button %}<a href="javascript:;" name="repeating-add" class="btn btn-link"
>{% block add_button_text %}<i class="fa fa-plus" aria-hidden="true"></i> {{ _('Add') }}{% endblock %}</a>{% endblock %}

{% set help_text = h.scheming_language_text(field.help_text) %}
{% if help_text %}
<div class="info-block mrgn-tp-md">
{{ help_text }}
</div>
{% endif %}
</div>
{%- snippet 'scheming/form_snippets/help_text.html', field=field -%}
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the actual core of the change, as discussed in #396. The other changes are just the tab -> space conversion.

</div>

<div name="repeating-template" style="display:none">{{ repeating_panel('REPEATING-INDEX0', 'REPEATING-INDEX1') }}</div>
<div name="repeating-template" style="display:none">{{ repeating_panel('REPEATING-INDEX0', 'REPEATING-INDEX1') }}</div>
</fieldset>
</div>
{% endcall %}
Loading