Skip to content
This repository was archived by the owner on Jul 15, 2025. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 7 additions & 7 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
repos:
- repo: https://github.com/psf/black
rev: 23.9.1
rev: 25.1.0
hooks:
- id: black
args: [--safe, --quiet]
- repo: https://github.com/asottile/blacken-docs
rev: 1.16.0
rev: 1.19.1
hooks:
- id: blacken-docs
additional_dependencies: [black==23.1.0]
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v5.0.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
Expand All @@ -21,15 +21,15 @@ repos:
exclude: _pytest/(debugging|hookspec).py
language_version: python3
- repo: https://github.com/PyCQA/autoflake
rev: v2.2.1
rev: v2.3.1
hooks:
- id: autoflake
name: autoflake
args: ["--in-place", "--remove-unused-variables", "--remove-all-unused-imports"]
language: python
files: \.py$
- repo: https://github.com/PyCQA/flake8
rev: 6.1.0
rev: 7.3.0
hooks:
- id: flake8
language_version: python3
Expand All @@ -39,12 +39,12 @@ repos:
- flake8-no-pep420
- flake8-tidy-imports
- repo: https://github.com/asottile/reorder-python-imports
rev: v3.10.0
rev: v3.15.0
hooks:
- id: reorder-python-imports
args: ['--application-directories=.:src', --py37-plus]
- repo: https://github.com/asottile/pyupgrade
rev: v3.10.1
rev: v3.20.0
hooks:
- id: pyupgrade
args: [--py37-plus]
40 changes: 22 additions & 18 deletions django_table_sort/table.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,12 @@ def __init__(
elif column_names is not None:
empty_column_generator = EmptyColumnGenerator()
self.column_names = [
TableColumn(column_name, column_header, headers_css_classes)
if column_name
!= empty_column_generator.get_next_empty_column_key_no_add()
else empty_column_generator.get_next_empty_column(column_header)
(
TableColumn(column_name, column_header, headers_css_classes)
if column_name
!= empty_column_generator.get_next_empty_column_key_no_add()
else empty_column_generator.get_next_empty_column(column_header)
)
for column_name, column_header in column_names.items()
]
else:
Expand All @@ -142,12 +144,14 @@ def render(self) -> str:
{
"body": self.get_table_body(),
"headers": self.get_table_headers(),
"table_clases": str(f' class="{self.table_css_clases}"')
if self.table_css_clases is not None
else "",
"table_id": f' id="{self.table_id}"'
if self.table_id is not None
else "",
"table_clases": (
str(f' class="{self.table_css_clases}"')
if self.table_css_clases is not None
else ""
),
"table_id": (
f' id="{self.table_id}"' if self.table_id is not None else ""
),
},
)

Expand Down Expand Up @@ -197,11 +201,9 @@ def get_table_headers(self) -> str:
</div>
</th>""".format( # noqa: F522
remove_sort_url=remove_sort_url,
sort_direction=""
if first_sort
else "-up"
if not descending
else "-down",
sort_direction=(
"" if first_sort else "-up" if not descending else "-down"
),
field_to_sort=field_to_sort,
column_name=column_name,
ordering_text=f"Sort by {column_name}" if first_sort else "Toggle sort",
Expand Down Expand Up @@ -267,9 +269,11 @@ def sort_columns(self, field_order: list):
empty_column_generator = EmptyColumnGenerator()

field_order = [
field
if field != EMPTY_COLUMN
else empty_column_generator.get_next_empty_column_key()
(
field
if field != EMPTY_COLUMN
else empty_column_generator.get_next_empty_column_key()
)
for field in field_order
]

Expand Down
Loading