Skip to content

invites fix & GET /files/ fix #29

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
yakser merged 3 commits into from
Nov 15, 2022
Merged

invites fix & GET /files/ fix #29

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
4c090bd
Fixed 500 error on GET /files/
yakser Nov 15, 2022
ec23385
fixed invites not working
VeryBigSad Nov 15, 2022
daac508
Merge remote-tracking branch 'origin/dev' into dev
VeryBigSad Nov 15, 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
2 changes: 1 addition & 1 deletion files/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from files.serializers import UserFileSerializer


class FileView(generics.RetrieveDestroyAPIView):
class FileView(generics.GenericAPIView):
permission_classes = [permissions.IsAuthenticatedOrReadOnly]
serializer_class = UserFileSerializer
queryset = UserFile.objects.all()
Expand Down
7 changes: 0 additions & 7 deletions invites/filters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,6 @@ class InviteFilter(filters.FilterSet):
?is_active=false equals to .filter(is_active=False)
"""

def __init__(self, *args, **kwargs):
"""if is_active filter is not passed, default to True"""
super().__init__(*args, **kwargs)
if self.data.get("is_active") is None:
self.data = dict(self.data)
self.data["is_active"] = True

is_active = filters.BooleanFilter(field_name="is_active")

class Meta:
Expand Down
3 changes: 3 additions & 0 deletions invites/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,13 @@ def create(self, request, *args, **kwargs):


class InviteDetail(generics.RetrieveUpdateDestroyAPIView):
queryset = Invite.objects.all()
serializer_class = InviteDetailSerializer
permission_classes = [permissions.IsAuthenticatedOrReadOnly]


class InviteAccept(generics.GenericAPIView):
queryset = Invite.objects.all()
serializer_class = InviteDetailSerializer
permission_classes = [permissions.IsAuthenticatedOrReadOnly]

Expand All @@ -44,6 +46,7 @@ def post(self, request, *args, **kwargs):


class InviteDecline(generics.GenericAPIView):
queryset = Invite.objects.all()
serializer_class = InviteDetailSerializer
permission_classes = [permissions.IsAuthenticatedOrReadOnly]

Expand Down