Skip to content

Fix issue when different class is defined in attrs for th and td #35

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix issue when different class is defined in attrs for th and td #35

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
4 changes: 2 additions & 2 deletions ...umn_shifter/templates/django_tables2_column_shifter/_partials/bootstrap4_table_block.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
{% if column.attrs.td.class not in table.get_column_excluded %}
{% if column.attrs.td.class in table.get_column_default_show %}
<li class="btn-shift-column"
data-td-class="{{ column.attrs.td.class }}"
data-td-class="{{ column.name }}"
data-state="on"
{% if not forloop.last %} style="border-bottom:1px solid #ccc;" {%endif %}
data-table-class-container="{{ table.uniq_table_class_name }}">
Expand All @@ -48,7 +48,7 @@
</li>
{% else %}
<li class="btn-shift-column"
data-td-class="{{ column.attrs.td.class }}"
data-td-class="{{ column.name }}"
data-state="off"
{% if not forloop.last %} style="border-bottom:1px solid #ccc;" {%endif %}
data-table-class-container="{{ table.uniq_table_class_name }}">
Expand Down
4 changes: 2 additions & 2 deletions ...umn_shifter/templates/django_tables2_column_shifter/_partials/bootstrap5_table_block.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
{% if column.attrs.td.class not in table.get_column_excluded %}
{% if column.attrs.td.class in table.get_column_default_show %}
<li class="btn-shift-column"
data-td-class="{{ column.attrs.td.class }}"
data-td-class="{{ column.name }}"
data-state="on"
{% if not forloop.last %} style="border-bottom:1px solid #ccc;" {%endif %}
data-table-class-container="{{ table.uniq_table_class_name }}">
Expand All @@ -48,7 +48,7 @@
</li>
{% else %}
<li class="btn-shift-column"
data-td-class="{{ column.attrs.td.class }}"
data-td-class="{{ column.name }}"
data-state="off"
{% if not forloop.last %} style="border-bottom:1px solid #ccc;" {%endif %}
data-table-class-container="{{ table.uniq_table_class_name }}">
Expand Down
38 changes: 38 additions & 0 deletions django_tables2_column_shifter/tests/test_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,3 +239,41 @@ class Meta:
self.assertTrue('data-td-class="age"' in render)
self.assertFalse('data-td-class="first_name"' in render)
self.assertFalse('data-td-class="last_name"' in render)

def test_class_attrs(self):
"""
Class for targeting should be col name even if class defined in attrs
"""

for case in self.CASE:

if (
case["min_dt_version"] and case["min_dt_version"] > dt_version
) or (
case["max_dt_version"] and case["max_dt_version"] < dt_version
):
continue

class Tab(case["table_clsss"]):
first_name = tables.Column(
attrs={
"th": {"class": "text-nowrap"},
"td": {"class": "text-center"},
}
)

class Meta:
model = Author

table = Tab(Author.objects.all())
request = RequestFactory().get("/fake/url")
template = Template(
"""
{% load django_tables2 %}
{% render_table table %}
"""
)
ctx = Context({"table": table, "request": request})
render = template.render(ctx)

self.assertTrue('data-td-class="first_name"' in render)