Skip to content

Commit 133287f

Browse files
committed
more work on factory
1 parent 0492c15 commit 133287f

1 file changed

Lines changed: 11 additions & 9 deletions

File tree

django_adminlink/admin.py

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -166,12 +166,10 @@ class GroupedActionAdmin(SingleItemActionMixin, admin.ModelAdmin):
166166

167167
class ChoiceListFilter(admin.SimpleListFilter):
168168
choices = {}
169-
169+
170170
def lookups(self, request, model_admin):
171-
return [
172-
(k, v) for k, (v, *__) in self.choices.items()
173-
]
174-
171+
return [(k, v) for k, (v, *__) in self.choices.items()]
172+
175173
def queryset(self, request, queryset):
176174
val = self.choices.get(self.value())
177175
if val and len(val) >= 2:
@@ -181,10 +179,14 @@ def queryset(self, request, queryset):
181179

182180

183181
def adminfilter_factory(parameter_name, choices, verbose_name=None):
184-
default_verbose_name = parameter_name.replace('_', ' ')
182+
default_verbose_name = parameter_name.replace("_", " ")
185183
if verbose_name is None:
186184
verbose_name = default_verbose_name.capitalize()
187-
class_name = default_verbose_name.title().replace(' ', '')
185+
class_name = default_verbose_name.title().replace(" ", "")
188186
if not isinstance(choices, dict):
189-
choices = {k: vs for for k, *vs in choices}
190-
return type(f'{class_name}Filter', (admin.ChoiceListFilter,), {'title': verbose_name, 'parameter_name': parameter_name, 'choices': choices})
187+
choices = {k: vs for k, *vs in choices}
188+
return type(
189+
f"{class_name}Filter",
190+
(admin.ChoiceListFilter,),
191+
{"title": verbose_name, "parameter_name": parameter_name, "choices": choices},
192+
)

0 commit comments

Comments
 (0)