Skip to content

Commit

Permalink
ViewSet.filter_class attribute renamed filterset_class
Browse files Browse the repository at this point in the history
Due to migration notice with django-filter. See: https://django-filter.readthedocs.io/en/main/guide/migration.html
  • Loading branch information
ivarnakken committed Jul 28, 2022
1 parent f154fbb commit b7183be
Show file tree
Hide file tree
Showing 15 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion lego/apps/articles/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class ArticlesViewSet(AllowedPermissionsMixin, viewsets.ModelViewSet):
queryset = Article.objects.all()
ordering = "-created_at"
serializer_class = DetailedArticleSerializer
filter_class = ArticleFilterSet
filterset_class = ArticleFilterSet

def get_queryset(self):
queryset = self.queryset.select_related("created_by").prefetch_related("tags")
Expand Down
4 changes: 2 additions & 2 deletions lego/apps/companies/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def get_queryset(self):


class SemesterViewSet(viewsets.ModelViewSet):
filter_class = SemesterFilterSet
filterset_class = SemesterFilterSet

queryset = Semester.objects.all()
serializer_class = SemesterSerializer
Expand All @@ -108,7 +108,7 @@ class CompanyInterestViewSet(AllowedPermissionsMixin, viewsets.ModelViewSet):

ordering = "-created_at"
queryset = CompanyInterest.objects.all()
filter_class = CompanyInterestFilterSet
filterset_class = CompanyInterestFilterSet

def get_serializer_class(self):
if self.action == "list":
Expand Down
4 changes: 2 additions & 2 deletions lego/apps/email/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class EmailListViewSet(

queryset = EmailList.objects.all()
ordering = "id"
filter_class = EmailListFilterSet
filterset_class = EmailListFilterSet

def get_serializer_class(self):
if self.action == "create":
Expand Down Expand Up @@ -58,7 +58,7 @@ class UserEmailViewSet(
)
serializer_class = UserEmailSerializer
ordering = "id"
filter_class = EmailUserFilterSet
filterset_class = EmailUserFilterSet
permission_handler = UserEmailPermissionHandler()

def get_serializer_class(self):
Expand Down
2 changes: 1 addition & 1 deletion lego/apps/events/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@

class EventViewSet(AllowedPermissionsMixin, viewsets.ModelViewSet):

filter_class = EventsFilterSet
filterset_class = EventsFilterSet
filter_backends = (
DjangoFilterBackend,
filters.OrderingFilter,
Expand Down
6 changes: 3 additions & 3 deletions lego/apps/followers/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,16 @@ def get_queryset(self):
class FollowUserViewSet(FollowerBaseViewSet):
serializer_class = FollowUserSerializer
queryset = FollowUser.objects.all().select_related("follower")
filter_class = FollowUserFilterSet
filterset_class = FollowUserFilterSet


class FollowEventViewSet(FollowerBaseViewSet):
serializer_class = FollowEventSerializer
queryset = FollowEvent.objects.all().select_related("follower")
filter_class = FollowEventFilterSet
filterset_class = FollowEventFilterSet


class FollowCompanyViewSet(FollowerBaseViewSet):
serializer_class = FollowCompanySerializer
queryset = FollowCompany.objects.all().select_related("follower")
filter_class = FollowCompanyFilterSet
filterset_class = FollowCompanyFilterSet
2 changes: 1 addition & 1 deletion lego/apps/gallery/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
class GalleryViewSet(AllowedPermissionsMixin, viewsets.ModelViewSet):

queryset = Gallery.objects.all().select_related("event", "cover")
filter_class = GalleryFilterSet
filterset_class = GalleryFilterSet
serializer_class = GallerySerializer
ordering = "-taken_at"

Expand Down
2 changes: 1 addition & 1 deletion lego/apps/joblistings/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

class JoblistingViewSet(AllowedPermissionsMixin, viewsets.ModelViewSet):
pagination_class = None
filter_class = JoblistingFilterSet
filterset_class = JoblistingFilterSet
ordering = "-created_at"

def get_serializer_class(self):
Expand Down
2 changes: 1 addition & 1 deletion lego/apps/meetings/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

class MeetingViewSet(AllowedPermissionsMixin, viewsets.ModelViewSet):

filter_class = MeetingFilterSet
filterset_class = MeetingFilterSet
serializer_class = MeetingDetailSerializer

def get_queryset(self):
Expand Down
2 changes: 1 addition & 1 deletion lego/apps/quotes/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
class QuoteViewSet(AllowedPermissionsMixin, viewsets.ModelViewSet):

queryset = Quote.objects.all().prefetch_related("tags")
filter_class = QuotesFilterSet
filterset_class = QuotesFilterSet
ordering = "-created_at"

def get_queryset(self):
Expand Down
2 changes: 1 addition & 1 deletion lego/apps/restricted/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class RestrictedMailViewSet(
viewsets.GenericViewSet,
):

filter_class = RestrictedMailFilterSet
filterset_class = RestrictedMailFilterSet

def get_queryset(self):
if self.request.user.is_authenticated:
Expand Down
4 changes: 2 additions & 2 deletions lego/apps/surveys/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
class SurveyViewSet(AllowedPermissionsMixin, viewsets.ModelViewSet):
queryset = Survey.objects.all().prefetch_related("questions", "submissions")
permission_classes = [SurveyPermissions]
filter_class = SurveyFilterSet
filterset_class = SurveyFilterSet
filter_backends = (DjangoFilterBackend,)

ordering = ("-active_from", "title")
Expand Down Expand Up @@ -148,7 +148,7 @@ def get_serializer_class(self):
class SubmissionViewSet(AllowedPermissionsMixin, viewsets.ModelViewSet):
queryset = Submission.objects.all()
permission_classes = [SubmissionPermissions]
filter_class = SubmissionFilterSet
filterset_class = SubmissionFilterSet
pagination_class = None
filter_backends = (DjangoFilterBackend,)

Expand Down
2 changes: 1 addition & 1 deletion lego/apps/users/views/abakus_groups.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class AbakusGroupViewSet(AllowedPermissionsMixin, viewsets.ModelViewSet):

queryset = AbakusGroup.objects.all()
ordering = "id"
filter_class = AbakusGroupFilterSet
filterset_class = AbakusGroupFilterSet
pagination_class = None

def get_serializer_class(self):
Expand Down
2 changes: 1 addition & 1 deletion lego/apps/users/views/membership_history.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class MembershipHistoryViewSet(

permission_classes = (permissions.IsAuthenticated,)
serializer_class = MembershipHistorySerializer
filter_class = MembershipHistoryFilterSet
filterset_class = MembershipHistoryFilterSet
ordering = "id"

def get_queryset(self):
Expand Down
2 changes: 1 addition & 1 deletion lego/apps/users/views/memberships.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

class MembershipViewSet(AllowedPermissionsMixin, viewsets.ModelViewSet):
serializer_class = MembershipSerializer
filter_class = MembershipFilterSet
filterset_class = MembershipFilterSet
ordering_fields = ["id", "role"]
filter_backends = (
DjangoFilterBackend,
Expand Down
2 changes: 1 addition & 1 deletion lego/apps/users/views/penalties.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ class PenaltyViewSet(
):
queryset = Penalty.objects.all()
serializer_class = PenaltySerializer
filter_class = PenaltyFilterSet
filterset_class = PenaltyFilterSet

0 comments on commit b7183be

Please sign in to comment.