Skip to content
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.

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

[DONE] change all filter_fields = () in filterset_fields = [] #1191

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions pod/authentication/rest_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class Meta:
"email",
"groups",
)
filter_fields = ("id", "username", "email")
filterset_fields = ["id", "username", "email"]


class GroupSerializer(serializers.HyperlinkedModelSerializer):
Expand Down Expand Up @@ -88,7 +88,7 @@ class OwnerViewSet(viewsets.ModelViewSet):
class UserViewSet(viewsets.ModelViewSet):
queryset = User.objects.all().order_by("-date_joined")
serializer_class = UserSerializer
filter_fields = ("id", "username", "email")
filterset_fields = ["id", "username", "email"]


class GroupViewSet(viewsets.ModelViewSet):
Expand Down
4 changes: 2 additions & 2 deletions pod/bbb/rest_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ class Meta:
"server",
"user",
)
filter_fields = ("status", "server")
filterset_fields = ["status", "server"]


class LivestreamModelViewSet(viewsets.ModelViewSet):
queryset = Livestream.objects.all()
serializer_class = LivestreamModelSerializer
filter_fields = ("status", "server")
filterset_fields = ["status", "server"]
4 changes: 2 additions & 2 deletions pod/meeting/rest_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class LivestreamModelSerializer(serializers.HyperlinkedModelSerializer):
class Meta:
model = Livestream
fields = ("id", "meeting", "status", "event", "live_gateway_id")
filter_fields = "status"
filterset_fields = ["status"]


class LivestreamModelViewSet(viewsets.ModelViewSet):
Expand All @@ -58,7 +58,7 @@ class Meta:
"broadcaster_id",
"site_id",
)
filter_fields = "site_id"
filterset_fields = ["site_id"]


class LiveGatewayModelViewSet(viewsets.ModelViewSet):
Expand Down
4 changes: 2 additions & 2 deletions pod/playlist/rest_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ class PlaylistViewSet(viewsets.ModelViewSet):

queryset = Playlist.objects.all()
serializer_class = PlaylistSerializer
filter_fields = (
filterset_fields = [
"owner",
"visibility",
"autoplay",
"editable",
)
]
4 changes: 2 additions & 2 deletions pod/recorder/rest_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class RecordingFileTreatmentModelSerializer(serializers.HyperlinkedModelSerializ
class Meta:
model = RecordingFileTreatment
fields = ("id", "file", "file_size", "recorder", "type", "date_added")
filter_fields = ("date_added", "recorder", "file", "id")
filterset_fields = ["date_added", "recorder", "file", "id"]


class RecordingModelSerializer(serializers.HyperlinkedModelSerializer):
Expand All @@ -30,7 +30,7 @@ class Meta:
class RecordingFileTreatmentModelViewSet(viewsets.ModelViewSet):
queryset = RecordingFileTreatment.objects.all()
serializer_class = RecordingFileTreatmentModelSerializer
filter_fields = ("date_added", "recorder", "file", "id")
filterset_fields = ["date_added", "recorder", "file", "id"]


class RecordingModelViewSet(viewsets.ModelViewSet):
Expand Down
4 changes: 2 additions & 2 deletions pod/video/rest_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -203,15 +203,15 @@ class DisciplineViewSet(viewsets.ModelViewSet):
class VideoViewSet(viewsets.ModelViewSet):
queryset = Video.objects.all()
serializer_class = VideoSerializer
filter_fields = (
filterset_fields = [
"owner",
"type",
"date_added",
"is_draft",
"is_restricted",
"encoding_in_progress",
"sites",
)
]

@action(detail=False, methods=["get"])
def user_videos(self, request):
Expand Down
4 changes: 2 additions & 2 deletions pod/video_encode_transcript/rest_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class EncodingVideoViewSet(viewsets.ModelViewSet):

queryset = EncodingVideo.objects.all()
serializer_class = EncodingVideoSerializer
filter_fields = ("video",)
filterset_fields = ["video",]

@action(detail=False, methods=["get"])
def video_encodedfiles(self, request):
Expand Down Expand Up @@ -108,7 +108,7 @@ class EncodingAudioViewSet(viewsets.ModelViewSet):

queryset = EncodingAudio.objects.all()
serializer_class = EncodingAudioSerializer
filter_fields = ("video",)
filterset_fields = ["video",]

@action(detail=False, methods=["get"])
def audio_encodedfiles(self, request):
Expand Down