Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions auth_backend/admin/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down Expand Up @@ -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",
Expand All @@ -69,10 +69,17 @@ 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
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)
Expand Down Expand Up @@ -107,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"]
Expand All @@ -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)

Expand Down
Loading