mirrors/takahe
1
1
Fork 0
mirror of https://github.com/jointakahe/takahe.git synced 2025-02-16 23:55:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Better djadmin Identity search (#253)

Browse source
This commit is contained in:
Michael Manfre 2022-12-24 08:34:15 -05:00 committed by GitHub
parent f5d06d2656
commit c25da3a95f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
users/admin.py
View file

@ -1,4 +1,5 @@
from django.contrib import admin from django.contrib import admin
from django.db import models
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from activities.admin import IdentityLocalFilter from activities.admin import IdentityLocalFilter
@ -41,8 +42,19 @@ class IdentityAdmin(admin.ModelAdmin):
list_filter = ("local", "state", "discoverable") list_filter = ("local", "state", "discoverable")
raw_id_fields = ["users"] raw_id_fields = ["users"]
actions = ["force_update"] actions = ["force_update"]
readonly_fields = ["actor_json"] readonly_fields = ["handle", "actor_json"]
search_fields = ["username", "name"] search_fields = ["search_handle", "search_service_handle", "name", "id"]
def get_search_results(self, request, queryset, search_term):
from django.db.models.functions import Concat
queryset = queryset.annotate(
search_handle=Concat("username", models.Value("@"), "domain_id"),
search_service_handle=Concat(
"username", models.Value("@"), "domain__service_domain"
),
)
return super().get_search_results(request, queryset, search_term)
@admin.action(description="Force Update") @admin.action(description="Force Update")
def force_update(self, request, queryset): def force_update(self, request, queryset):