Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Use django-filter to filter the ingredient overview

Roland Geider5373fb93f7a2
diff --git a/wger/nutrition/templates/ingredient/overview.html b/wger/nutrition/templates/ingredient/overview.html
index 895d2a9cc..ed054588f 100644
--- a/wger/nutrition/templates/ingredient/overview.html
+++ b/wger/nutrition/templates/ingredient/overview.html
@@ -57,7 +57,6 @@
<h4 class="mt-4">{% translate "Filter" %}</h4>
<form method="GET" action="">
<div class="mb-3">
- <label class="form-label">{% translate "Dietary" %}</label>
<div class="form-check">
<input class="form-check-input"
type="checkbox"
@@ -66,7 +65,7 @@
value="1"
{% if request.GET.is_vegan %}checked{% endif %}>
<label class="form-check-label" for="filter-vegan">
- {% translate "Vegan only" %}
+ {% translate "Vegan" %}
</label>
</div>
<div class="form-check">
@@ -77,7 +76,7 @@
value="1"
{% if request.GET.is_vegetarian %}checked{% endif %}>
<label class="form-check-label" for="filter-vegetarian">
- {% translate "Vegetarian only" %}
+ {% translate "Vegetarian" %}
</label>
</div>
</div>
diff --git a/wger/nutrition/views/ingredient.py b/wger/nutrition/views/ingredient.py
index 5ab990976..a89a946f5 100644
--- a/wger/nutrition/views/ingredient.py
+++ b/wger/nutrition/views/ingredient.py
@@ -44,6 +44,7 @@ from django.views.generic import (
)
# wger
+from wger.nutrition.api.filtersets import IngredientFilterSet
from wger.nutrition.forms import (
IngredientForm,
UnitChooserForm,
@@ -74,22 +75,17 @@ class IngredientListView(ListView):
template_name = 'ingredient/overview.html'
context_object_name = 'ingredients_list'
paginate_by = PAGINATION_OBJECTS_PER_PAGE
+ filterset_class = IngredientFilterSet
def get_queryset(self):
"""
Filter the ingredients the user will see by its language, optionally
- also filtering by dietary properties (is_vegan, is_vegetarian).
+ also filtering by other properties
"""
language = load_language()
queryset = Ingredient.objects.filter(language=language)
-
- if self.request.GET.get('is_vegan'):
- queryset = queryset.filter(is_vegan=True)
-
- if self.request.GET.get('is_vegetarian'):
- queryset = queryset.filter(is_vegetarian=True)
-
- return queryset
+ filterset = self.filterset_class(self.request.GET or None, queryset=queryset)
+ return filterset.qs
def dispatch(self, request, *args, **kwargs):
"""