From 8a434f9d08027c98b03f37936ad6e4a6f0fb324d Mon Sep 17 00:00:00 2001 From: sax Date: Wed, 28 Feb 2024 22:00:05 +0100 Subject: [PATCH 1/2] fixes bug in AutoCompleteFilter --- src/adminfilters/autocomplete.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/adminfilters/autocomplete.py b/src/adminfilters/autocomplete.py index 6165668..10a0092 100644 --- a/src/adminfilters/autocomplete.py +++ b/src/adminfilters/autocomplete.py @@ -114,18 +114,18 @@ def __init__(self, field, request, params, model, model_admin, field_path): self.parent_lookup_kwarg = f"{self.parent}__exact" super().__init__(field, request, params, model, model_admin, field_path) for pos, entry in enumerate(model_admin.list_filter): - if ( - isinstance(entry, (list, tuple)) - and len(entry) == 2 - and entry[0] != self.field_path - and entry[1].__name__ == type(self).__name__ - and entry[1].parent == self.field_path - ): - kwarg = f"{entry[0]}__exact" - if entry[1].parent: - if kwarg not in self.dependants: - self.dependants.extend(entry[1].dependants) - self.dependants.append(kwarg) + if isinstance(entry, (list, tuple)): + if ( + len(entry) == 2 + and entry[0] != self.field_path + and entry[1].__name__ == type(self).__name__ + and entry[1].parent == self.field_path + ): + kwarg = f"{entry[0]}__exact" + if entry[1].parent: + if kwarg not in self.dependants: + self.dependants.extend(entry[1].dependants) + self.dependants.append(kwarg) def has_output(self): if self.parent: From db2b92e656e9e8d803b587991debad5d37fa8819 Mon Sep 17 00:00:00 2001 From: sax Date: Wed, 28 Feb 2024 22:14:07 +0100 Subject: [PATCH 2/2] bump version --- .bumpversion.cfg | 2 +- CHANGES.md | 9 +++++++-- src/adminfilters/__init__.py | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index d99f453..c3e731f 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.3.1 +current_version = 2.4.1 parse = (?P\d+)\.(?P\d+)\.(?P\d+) serialize = {major}.{minor}.{release} commit = False diff --git a/CHANGES.md b/CHANGES.md index f67f414..7c51268 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,10 +1,15 @@ +Release 2.4.1 +============= +* Fixes bug in AutiCompleteFilter + + Release 2.4 -================= +=========== * Django 5.x support Release 2.3.1 -=============== +============= * Bug fixes diff --git a/src/adminfilters/__init__.py b/src/adminfilters/__init__.py index 1382ed1..43f2bd2 100644 --- a/src/adminfilters/__init__.py +++ b/src/adminfilters/__init__.py @@ -1,3 +1,3 @@ NAME = "django-adminfilters" -VERSION = __version__ = "2.4" +VERSION = __version__ = "2.4.1" __author__ = "sax"