Skip to content

Commit 48d0a41

Browse files
committed
fix: Updated search breaking for json fields
1 parent 3cf0ec8 commit 48d0a41

File tree

2 files changed

+31
-4
lines changed

2 files changed

+31
-4
lines changed

Access/admin.py

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,26 +26,50 @@ class UserAdmin(admin.ModelAdmin):
2626

2727
class MembershipV2AdminPanel(admin.ModelAdmin):
2828
'''Class to describe how to display MembershipV2 on admin panel'''
29-
ordering = ("membership_id", "user", "group")
30-
search_fields = ("membership_id", "user", "group")
29+
ordering = ("membership_id", "user__name", "group__name")
30+
search_fields = ("membership_id", "user__name", "group__name")
3131
list_display = ("membership_id", "user", "group")
3232

3333

3434
class AccessV2AdminPanel(admin.ModelAdmin):
3535
'''Class to describe how to display AccessV2 model on admin panel'''
3636
search_fields = ("access_tag", "access_label")
3737
list_display = ("access_tag", "access_label")
38+
sortable_by = ("access_tag",)
3839

3940

4041
class UserIdentityAdminPanel(admin.ModelAdmin):
4142
'''Class to describe how to display User Identity on admin panel'''
42-
search_fields = ("access_tag", "user", "identity", "status")
43+
search_fields = ("access_tag", "user__name", "status")
4344
list_display = ("access_tag", "user", "identity", "status")
4445

4546

47+
class UserAccessMappingAdminPanel(admin.ModelAdmin):
48+
'''Class to describe how to display UserAccessMapping on admin panel'''
49+
search_fields = (
50+
"request_id",
51+
"user_identity__user__name",
52+
"access__access_tag",
53+
"access__access_label",
54+
"status"
55+
)
56+
list_display = (
57+
"request_id",
58+
"get_user_name",
59+
"access",
60+
"status",
61+
)
62+
ordering = (
63+
"request_id",
64+
"user_identity__user__name",
65+
"access",
66+
"status"
67+
)
68+
69+
4670
admin.site.register(User, UserAdmin)
4771
admin.site.register(Permission)
48-
admin.site.register(UserAccessMapping)
72+
admin.site.register(UserAccessMapping, UserAccessMappingAdminPanel)
4973
admin.site.register(Role)
5074
admin.site.register(AccessV2, AccessV2AdminPanel)
5175
admin.site.register(GroupV2)

Access/models.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -940,6 +940,9 @@ def create(
940940
mapping.save()
941941
return mapping
942942

943+
def get_user_name(self):
944+
return self.user_identity.user.name
945+
943946

944947
class GroupAccessMapping(models.Model):
945948
"""

0 commit comments

Comments
 (0)