Skip to content

Commit 3afbe9a

Browse files
authored
Merge pull request #29 from PROCOLLAB-github/dev
invites fix & GET /files/ fix
2 parents 3b8f161 + daac508 commit 3afbe9a

3 files changed

Lines changed: 4 additions & 8 deletions

File tree

files/views.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from files.serializers import UserFileSerializer
1010

1111

12-
class FileView(generics.RetrieveDestroyAPIView):
12+
class FileView(generics.GenericAPIView):
1313
permission_classes = [permissions.IsAuthenticatedOrReadOnly]
1414
serializer_class = UserFileSerializer
1515
queryset = UserFile.objects.all()

invites/filters.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,6 @@ class InviteFilter(filters.FilterSet):
1717
?is_active=false equals to .filter(is_active=False)
1818
"""
1919

20-
def __init__(self, *args, **kwargs):
21-
"""if is_active filter is not passed, default to True"""
22-
super().__init__(*args, **kwargs)
23-
if self.data.get("is_active") is None:
24-
self.data = dict(self.data)
25-
self.data["is_active"] = True
26-
2720
is_active = filters.BooleanFilter(field_name="is_active")
2821

2922
class Meta:

invites/views.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,13 @@ def create(self, request, *args, **kwargs):
2626

2727

2828
class InviteDetail(generics.RetrieveUpdateDestroyAPIView):
29+
queryset = Invite.objects.all()
2930
serializer_class = InviteDetailSerializer
3031
permission_classes = [permissions.IsAuthenticatedOrReadOnly]
3132

3233

3334
class InviteAccept(generics.GenericAPIView):
35+
queryset = Invite.objects.all()
3436
serializer_class = InviteDetailSerializer
3537
permission_classes = [permissions.IsAuthenticatedOrReadOnly]
3638

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

4547

4648
class InviteDecline(generics.GenericAPIView):
49+
queryset = Invite.objects.all()
4750
serializer_class = InviteDetailSerializer
4851
permission_classes = [permissions.IsAuthenticatedOrReadOnly]
4952

0 commit comments

Comments
 (0)