Skip to content

Dev #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
VeryBigSad merged 3 commits into from
Nov 22, 2022
Merged

Dev #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
71f64fd
fix admin
VeryBigSad Nov 22, 2022
9b3bd5d
fix user list sees unapproved
VeryBigSad Nov 22, 2022
92b8c63
fix admin
VeryBigSad Nov 22, 2022
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
9 changes: 8 additions & 1 deletion procollab/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -97,7 +105,6 @@

CORS_ALLOW_ALL_ORIGINS = True


INTERNAL_IPS = [
"127.0.0.1",
]
Expand Down
1 change: 1 addition & 0 deletions users/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ class CustomUserAdmin(admin.ModelAdmin):
"patronymic",
"birthday",
"avatar",
"is_active",
)
},
),
Expand Down
3 changes: 2 additions & 1 deletion users/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,)
Expand Down