From 0761c921ffcf4dde8b324671aa8525e44587b5e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Us=C3=A1n?= Date: Sat, 4 Jun 2022 12:20:37 +0200 Subject: [PATCH 1/3] Improved list view and form view for MFAMethodAdmin class. Added select_related for user fk, list_display, list_filter and search_field --- trench/admin.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/trench/admin.py b/trench/admin.py index afad7d73..3fb31f48 100644 --- a/trench/admin.py +++ b/trench/admin.py @@ -1,8 +1,15 @@ from django.contrib import admin -from trench.models import MFAMethod +from trench.utils import get_mfa_model + + +MFAModel = get_mfa_model() @admin.register(MFAMethod) class MFAMethodAdmin(admin.ModelAdmin): - pass + autocomplete_fields = ['user'] + list_display = ['user', 'name', 'is_primary', 'is_active'] + list_filter = ['name', 'is_primary', 'is_active'] + list_select_related = ['user'] + search_fields = ['user'] From 7f9842a7afe69e82a048722735c87d54a8ea4c22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Us=C3=A1n?= Date: Sat, 4 Jun 2022 12:22:01 +0200 Subject: [PATCH 2/3] Appended static urlpatterns for serving admin static files in DEBUG mode --- testproject/testapp/urls.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/testproject/testapp/urls.py b/testproject/testapp/urls.py index e2235e7e..e8823b3f 100644 --- a/testproject/testapp/urls.py +++ b/testproject/testapp/urls.py @@ -1,4 +1,6 @@ +from django.conf import settings from django.conf.urls import include +from django.conf.urls.static import static from django.contrib import admin from django.urls import re_path @@ -21,7 +23,7 @@ permission_classes=(AllowAny,), ) -urlpatterns = ( +urlpatterns = [ re_path(r"^admin/", admin.site.urls), re_path(r"^auth/", include("trench.urls")), re_path(r"^auth/jwt/", include("trench.urls.jwt")), @@ -31,4 +33,9 @@ schema_view.with_ui("swagger", cache_timeout=0), name="schema-swagger-ui", ), -) +] + +if settings.DEBUG: + # Static files are served by Django in DEBUG mode + urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) + urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) From 4fb4a480ab9781fdf38b3f9eea7f138fe5f82945 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Us=C3=A1n?= Date: Sat, 4 Jun 2022 12:30:59 +0200 Subject: [PATCH 3/3] Fixed model name --- trench/admin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trench/admin.py b/trench/admin.py index 3fb31f48..33e4d3a3 100644 --- a/trench/admin.py +++ b/trench/admin.py @@ -3,7 +3,7 @@ from trench.utils import get_mfa_model -MFAModel = get_mfa_model() +MFAMethod = get_mfa_model() @admin.register(MFAMethod)