Commit e67e4f15 authored by Staś Kycia's avatar Staś Kycia
Browse files

fixed voters search

parent f71bb112
Loading
Loading
Loading
Loading
+0 −12
Changes for archive/admin.py: 0 added lines, 12 removed lines.
Original line number Diff line number Diff line
@@ -20,18 +20,6 @@ class ArchivedVoterAdmin(AdminActionFormsMixin):
    search_fields = ["name", "email"]
    list_filter = ["group"]

    def get_search_results(self, request, queryset, search_term):
        queryset, use_distinct = super().get_search_results(
            request, queryset, search_term
        )

        if search_term:
            queryset |= queryset.annotate(full_name="name").filter(
                full_name__icontains=search_term
            )

        return queryset, use_distinct

    @action_with_form(RestoreVotersActionForm, description="Przywróć")
    def restore(self, request, queryset, data):
        queryset.update(is_archived=False)
+1 −12
Changes for hybrid/admin.py: 1 added line, 12 removed lines.
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ class IssueCardAdmin(admin.ModelAdmin):
    search_fields = ["name", "email", "group"]
    list_filter = ["group", ElectionContextFilter]
    search_fields = ["name", "email"]
    ordering = ["name"]

    change_list_template = "admin/issue_card_list.html"

@@ -64,18 +65,6 @@ class IssueCardAdmin(admin.ModelAdmin):
        extra_context["title"] = "Wydawanie kart"
        return super().changelist_view(request, extra_context)

    def get_search_results(self, request, queryset, search_term):
        queryset, use_distinct = super().get_search_results(
            request, queryset, search_term
        )

        if search_term:
            queryset |= queryset.annotate(full_name="name").filter(
                full_name__icontains=search_term
            )

        return queryset, use_distinct

    def get_queryset(self, request):
        return super().get_queryset(request).filter(is_archived=False)