From 57a6654c89fbc41ef72ff15fe0d92db4c1c8d684 Mon Sep 17 00:00:00 2001 From: Egor fureunoir Gorbunov Date: Tue, 20 May 2025 19:46:10 +0300 Subject: [PATCH] Features: 1) Add return type annotations for admin actions. Fixes: 1) Correct translation wrapping by converting to strings with str(). Extra: 1) Minor refactoring and cleanup in admin action methods for clarity. --- core/admin.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/core/admin.py b/core/admin.py index 64691b8c..8411d05b 100644 --- a/core/admin.py +++ b/core/admin.py @@ -34,25 +34,27 @@ from .models import ( class BasicModelAdmin(ModelAdmin): - @admin.action(description=_("activate selected %(verbose_name_plural)s")) - def activate_selected(self, request, queryset): + @admin.action(description=str(_("activate selected %(verbose_name_plural)s"))) + def activate_selected(self, request, queryset) -> str: queryset.update(is_active=True) + return "" - @admin.action(description=_("deactivate selected %(verbose_name_plural)s")) - def deactivate_selected(self, request, queryset): + @admin.action(description=str(_("deactivate selected %(verbose_name_plural)s"))) + def deactivate_selected(self, request, queryset) -> str: queryset.update(is_active=False) + return "" def get_actions(self, request): actions = super().get_actions(request) actions["activate_selected"] = ( self.activate_selected, "activate_selected", - _("activate selected %(verbose_name_plural)s"), + str(_("activate selected %(verbose_name_plural)s")), ) actions["deactivate_selected"] = ( self.deactivate_selected, "deactivate_selected", - _("deactivate selected %(verbose_name_plural)s"), + str(_("deactivate selected %(verbose_name_plural)s")), ) return actions