From 71f64fd4dbd12379de66d5caab2d624207e93502 Mon Sep 17 00:00:00 2001 From: Mikhail Khromov Date: Tue, 22 Nov 2022 20:31:34 +0300 Subject: [PATCH 1/3] fix admin --- procollab/settings.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/procollab/settings.py b/procollab/settings.py index 9cfe5f38..bb815a0b 100644 --- a/procollab/settings.py +++ b/procollab/settings.py @@ -18,6 +18,14 @@ SENTRY_DSN = config("SENTRY_DSN", default="", cast=str) +CSRF_TRUSTED_ORIGINS = [ + "http://localhost", + "https://api.procollab.ru", + "https://procollab.ru", + "https://www.procollab.ru", + "https://app.procollab.ru", +] + ALLOWED_HOSTS = [ "127.0.0.1", "localhost", @@ -97,7 +105,6 @@ CORS_ALLOW_ALL_ORIGINS = True - INTERNAL_IPS = [ "127.0.0.1", ] From 9b3bd5def2fe1e4103ceca4aa39b8b063cbfb6a8 Mon Sep 17 00:00:00 2001 From: Mikhail Khromov Date: Tue, 22 Nov 2022 20:38:01 +0300 Subject: [PATCH 2/3] fix user list sees unapproved --- users/views.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/users/views.py b/users/views.py index 1e2b6fcd..76f4efd5 100644 --- a/users/views.py +++ b/users/views.py @@ -45,7 +45,8 @@ class UserList(ListCreateAPIView): - queryset = User.objects.all() + # TODO: add to manager + queryset = User.objects.filter(is_active=True) permission_classes = [AllowAny] # FIXME: change to IsAuthorized serializer_class = UserListSerializer filter_backends = (filters.DjangoFilterBackend,) From 92b8c6313f4b1d116836ee30cb0917b7e5fb0fb3 Mon Sep 17 00:00:00 2001 From: Mikhail Khromov Date: Tue, 22 Nov 2022 20:53:12 +0300 Subject: [PATCH 3/3] fix admin --- users/admin.py | 1 + 1 file changed, 1 insertion(+) diff --git a/users/admin.py b/users/admin.py index 761efd5c..a050a469 100644 --- a/users/admin.py +++ b/users/admin.py @@ -28,6 +28,7 @@ class CustomUserAdmin(admin.ModelAdmin): "patronymic", "birthday", "avatar", + "is_active", ) }, ),