Skip to content

Commit b36ebec

Browse files
authored
fix(templates): Remove use of deprecated filter (#238)
The length_is filter has been deprecated in favour of using the length filter with an equality operator.
1 parent ffdd837 commit b36ebec

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

nested_admin/templates/nesting/admin/includes/grappelli_inline.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
{% if fieldset.name %}<h4 class="djn-collapse-handler grp-collapse-handler">{{ fieldset.name }}</h4>{% endif %}
55
{% if fieldset.description %}<div class="grp-row"><p class="grp-description">{{ fieldset.description|safe }}</p></div>{% endif %}
66
{% for line in fieldset %}
7-
<div class="form-row djn-row grp-row grp-cells-{{ line.fields|length }}{% if not line.fields|length_is:"1" %} grp-cells{% else %}{% if line.errors %} grp-errors{% endif %}{% for field in line %} {{ field.field.name }} field-{{ field.field.name }}{% endfor %}{% endif %}{% if not line.has_visible_field %} grp-row-hidden{% endif %}">
7+
<div class="form-row djn-row grp-row grp-cells-{{ line.fields|length }}{% if not line.fields|length == 1 %} grp-cells{% else %}{% if line.errors %} grp-errors{% endif %}{% for field in line %} {{ field.field.name }} field-{{ field.field.name }}{% endfor %}{% endif %}{% if not line.has_visible_field %} grp-row-hidden{% endif %}">
88
{% for field in line %}
9-
{# <div{% if not line.fields|length_is:"1" %} class="cell {{ field.field.name }}{% if field.errors %} error{% endif %}"{% endif %}> #}
10-
<div class="field-box l-2c-fluid l-d-4{% if line.fields|length_is:"1" %}{% else %} grp-cell{% if field.field.name %} {{ field.field.name }} field-{{ field.field.name }}{% endif %}{% if field.field.errors %} grp-errors{% endif %}{% endif %}">
9+
{# <div{% if not line.fields|length == 1 %} class="cell {{ field.field.name }}{% if field.errors %} error{% endif %}"{% endif %}> #}
10+
<div class="field-box l-2c-fluid l-d-4{% if line.fields|length == 1 %}{% else %} grp-cell{% if field.field.name %} {{ field.field.name }} field-{{ field.field.name }}{% endif %}{% if field.field.errors %} grp-errors{% endif %}{% endif %}">
1111
{% if field.is_checkbox %}
1212
<div class="c-1">&nbsp;</div>
1313
<div class="c-2">
@@ -21,8 +21,8 @@
2121
{{ field.field }}
2222
{% endif %}
2323
{% endif %}
24-
{% if line.fields|length_is:'1' %}{{ line.errors }}{% endif %}
25-
{% if not line.fields|length_is:'1' and not field.is_readonly %}{{ field.errors }}{% endif %}
24+
{% if line.fields|length == 1 %}{{ line.errors }}{% endif %}
25+
{% if not line.fields|length == 1 and not field.is_readonly %}{{ field.errors }}{% endif %}
2626
{% if field.field.field.help_text %}
2727
<p class="grp-help">{{ field.field.field.help_text|safe }}</p>
2828
{% endif %}
@@ -32,4 +32,4 @@
3232
</div>
3333
{% endfor %}
3434
</fieldset>
35-
{% endspaceless %}
35+
{% endspaceless %}

nested_admin/templates/nesting/admin/includes/inline.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
<div class="description">{{ fieldset.description|safe }}</div>
55
{% endif %}
66
{% for line in fieldset %}
7-
<div class="form-row{% if line.fields|length_is:'1' and line.errors %} errors{% endif %}{% if not line.has_visible_field %} hidden{% endif %}{% for field in line %}{% if field.field.name %} field-{{ field.field.name }}{% endif %}{% endfor %}{% if forloop.last and forloop.parentloop.last %} djn-form-row-last{% endif %}">
8-
{% if line.fields|length_is:'1' %}{{ line.errors }}{% endif %}
7+
<div class="form-row{% if line.fields|length == 1 and line.errors %} errors{% endif %}{% if not line.has_visible_field %} hidden{% endif %}{% for field in line %}{% if field.field.name %} field-{{ field.field.name }}{% endif %}{% endfor %}{% if forloop.last and forloop.parentloop.last %} djn-form-row-last{% endif %}">
8+
{% if line.fields|length == 1 %}{{ line.errors }}{% endif %}
99
{% for field in line %}
10-
<div class="{% if line.fields|length_is:'1' and field.is_checkbox %}checkbox-row{% else %}{% if not line.fields|length_is:'1' %}fieldBox{% if not field.is_readonly and field.errors %} errors{% endif %}{% if field.field.is_hidden %} hidden{% endif %} {% endif %}field-{{ field.field.name }}{% endif %}">
11-
{% if not line.fields|length_is:'1' and not field.is_readonly %}{{ field.errors }}{% endif %}
10+
<div class="{% if line.fields|length == 1 and field.is_checkbox %}checkbox-row{% else %}{% if not line.fields|length == 1 %}fieldBox{% if not field.is_readonly and field.errors %} errors{% endif %}{% if field.field.is_hidden %} hidden{% endif %} {% endif %}field-{{ field.field.name }}{% endif %}">
11+
{% if not line.fields|length == 1 and not field.is_readonly %}{{ field.errors }}{% endif %}
1212
{% if field.is_checkbox %}
1313
{{ field.field }}{{ field.label_tag }}
1414
{% else %}

0 commit comments

Comments
 (0)