From da3e5804f95c25707ad84be759935780618bac33 Mon Sep 17 00:00:00 2001 From: petrCher <88943157+petrCher@users.noreply.github.com> Date: Mon, 27 Jul 2026 18:18:23 +0300 Subject: [PATCH 1/2] added userfriendly search --- auth_backend/admin/admin.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/auth_backend/admin/admin.py b/auth_backend/admin/admin.py index 80508cb..d3719f5 100644 --- a/auth_backend/admin/admin.py +++ b/auth_backend/admin/admin.py @@ -73,6 +73,13 @@ class GroupAdmin(ModelView, model=Group): column_default_sort = [("id", False)] form_excluded_columns = ["child", "users", "create_ts", "update_ts", "is_deleted"] form_converter = FilteredModelConverter + form_ajax_refs = { + "scopes": { + "fields": ["name"], + "order_by": "name", + "page_size": 20, + }, + } def list_query(self, request: Request) -> Select: return select(Group).where(Group.is_deleted == False) @@ -123,6 +130,14 @@ class UserAdmin(ModelView, model=User): } form_converter = FilteredModelConverter + form_ajax_refs = { + "groups": { + "fields": ["name"], + "order_by": "name", + "page_size": 20, + }, + } + def list_query(self, request: Request) -> Select: return select(User).where(User.is_deleted == False) From 19c746fc6305722527bc4627cc5ceaa900c929c1 Mon Sep 17 00:00:00 2001 From: petrCher <88943157+petrCher@users.noreply.github.com> Date: Tue, 4 Aug 2026 22:39:26 +0300 Subject: [PATCH 2/2] small fix with search columns --- auth_backend/admin/admin.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/auth_backend/admin/admin.py b/auth_backend/admin/admin.py index d3719f5..36b48f6 100644 --- a/auth_backend/admin/admin.py +++ b/auth_backend/admin/admin.py @@ -22,7 +22,7 @@ class ScopeAdmin(ModelView, model=Scope): "creator_id", "is_deleted", ] - column_searchable_list = ["id", "name"] + column_searchable_list = ["id", "name", "comment"] column_sortable_list = ["id", "name"] column_default_sort = [("id", False)] form_excluded_columns = ["create_ts", "update_ts", "groups", "user_sessions", "is_deleted"] @@ -57,7 +57,7 @@ async def delete_model(self, request, pk): class GroupAdmin(ModelView, model=Group): name = "Group" name_plural = "Groups" - column_list = ["id", "name", "scopes", "users", "parent_id"] + column_list = ["id", "name", "scopes"] column_details_list = [ "id", "name", @@ -69,7 +69,7 @@ class GroupAdmin(ModelView, model=Group): "is_deleted", ] column_searchable_list = ["name"] - column_sortable_list = ["id", "name", "parent_id", "is_deleted"] + column_sortable_list = ["id", "name"] column_default_sort = [("id", False)] form_excluded_columns = ["child", "users", "create_ts", "update_ts", "is_deleted"] form_converter = FilteredModelConverter @@ -114,7 +114,7 @@ async def delete_model(self, request, pk): class UserAdmin(ModelView, model=User): name = "User" name_plural = "Users" - column_list = ["id", "scopes", "groups"] + column_list = ["id", "groups"] column_details_list = ["id", "groups", "scopes", "is_deleted"] column_searchable_list = ["id"] column_sortable_list = ["id", "is_deleted"]