Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-05-17 03:31:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove spurious uses of unlocalize filter on widget ID

Browse source 
These were added in #3478 to ensure that numeric object IDs would not be affected by local number formatting; however, within widget templates, attrs.id refers to a string identifier, not a numeric ID.
This commit is contained in:
Matt Westcott 2018-08-02 18:18:26 +01:00 committed by Matt Westcott
parent dc4ed6b3c1
commit 5874536849
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
wagtail/admin/templates/wagtailadmin/widgets/chooser.html
View file

@ -1,5 +1,3 @@
{% load i18n %}
{% load l10n %}
{% comment %}
Either the chosen or unchosen div will be shown, depending on the presence
of the 'blank' class on the container.
@ -8,7 +6,7 @@
when clicked.
{% endcomment %}
<div id="{{ attrs.id|unlocalize }}-chooser" class="chooser {% block chooser_class %}page-chooser{% endblock %} {% if not value %}blank{% endif %}">
<div id="{{ attrs.id }}-chooser" class="chooser {% block chooser_class %}page-chooser{% endblock %} {% if not value %}blank{% endif %}">
<div class="chosen">
{% block chosen_state_view %}{% endblock %}

11
wagtail/contrib/table_block/templates/table_block/widgets/table.html
View file

@ -1,24 +1,23 @@
{% load i18n %}
{% load l10n %}
<div class="field boolean_field widget-checkbox_input">
<label for="{{ attrs.id|unlocalize }}-handsontable-header">{% trans 'Row header' %}</label>
<label for="{{ attrs.id }}-handsontable-header">{% trans 'Row header' %}</label>
<div class="field-content">
<div class="input">
<input type="checkbox" id="{{ attrs.id|unlocalize }}-handsontable-header" name="handsontable-header"/>
<input type="checkbox" id="{{ attrs.id }}-handsontable-header" name="handsontable-header"/>
</div>
<p class="help">{% trans 'Display the first row as a header.' %}</p>
</div>
</div>
<br/>
<div class="field boolean_field widget-checkbox_input">
<label for="{{ attrs.id|unlocalize }}-handsontable-col-header">{% trans 'Column header' %}</label>
<label for="{{ attrs.id }}-handsontable-col-header">{% trans 'Column header' %}</label>
<div class="field-content">
<div class="input">
<input type="checkbox" id="{{ attrs.id|unlocalize }}-handsontable-col-header" name="handsontable-col-header"/>
<input type="checkbox" id="{{ attrs.id }}-handsontable-col-header" name="handsontable-col-header"/>
</div>
<p class="help">{% trans 'Display the first column as a header.' %}</p>
</div>
</div>
<br/>
<div id="{{ attrs.id|unlocalize }}-handsontable-container"></div>
<div id="{{ attrs.id }}-handsontable-container"></div>
{{ original_field_html }}