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.

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

Jump to bottom

Kl 2021 11 more propsal api filters #4014

Merged
merged 2 commits into from
Dec 2, 2021
Merged

Kl 2021 11 more propsal api filters #4014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ff20cb
settings: add django-filters to installed apps to use browser API vie…
fuzzylogic2000 Dec 1, 2021
7a80cea
apps/budgeting: add API filters for categories and is_archived
fuzzylogic2000 Dec 1, 2021
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
6 changes: 4 additions & 2 deletions meinberlin/apps/budgeting/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

from adhocracy4.api.mixins import ModuleMixin
from adhocracy4.api.permissions import ViewSetRulesPermission
from meinberlin.apps.contrib.filters import IdeaCategoryFilterBackend

from .models import Proposal
from .serializers import ProposalSerializer
Expand All @@ -32,8 +33,9 @@ class ProposalViewSet(ModuleMixin,
serializer_class = ProposalSerializer
permission_classes = (ViewSetRulesPermission,)
filter_backends = (DjangoFilterBackend,
OrderingFilter,)
# filter_fields = ('is_archived',)
OrderingFilter,
IdeaCategoryFilterBackend,)
filter_fields = ('is_archived', 'category',)
ordering_fields = ('created',
'comment_count',
'positive_rating_count',)
Expand Down
13 changes: 13 additions & 0 deletions meinberlin/apps/contrib/filters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from django.utils.translation import gettext_lazy as _
from rest_framework.filters import BaseFilterBackend

from adhocracy4.filters.filters import DistinctOrderingFilter
from adhocracy4.filters.widgets import DropdownLinkWidget
Expand All @@ -19,3 +20,15 @@ def __init__(self, *args, **kwargs):
kwargs['widget'] = OrderingWidget
kwargs['empty_label'] = None
super().__init__(*args, **kwargs)


class IdeaCategoryFilterBackend(BaseFilterBackend):
"""Filter ideas for the categories in API."""

def filter_queryset(self, request, queryset, view):

if 'category' in request.GET:
category = request.GET['category']
return queryset.filter(category=category)

return queryset
15 changes: 8 additions & 7 deletions meinberlin/config/settings/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,18 +52,19 @@
'wagtail.core',
'wagtail.contrib.styleguide',

'taggit', # wagtail dependency
'widget_tweaks',
'rest_framework',
'allauth',
'allauth.account',
'allauth.socialaccount',
'rules.apps.AutodiscoverRulesConfig',
'easy_thumbnails',
'background_task',
'capture_tag',
'ckeditor',
'ckeditor_uploader',
'capture_tag',
'background_task',
'django_filters',
'easy_thumbnails',
'rest_framework',
'rules.apps.AutodiscoverRulesConfig',
'taggit', # wagtail dependency
'widget_tweaks',

'adhocracy4.actions',
'adhocracy4.administrative_districts',
Expand Down