Self hosted FLOSS fitness/workout, nutrition and weight tracker
fix: unknown language code is ignored instead of defaulted to english
Anja Klipicd15a5a646cb8
diff --git a/wger/nutrition/api/filtersets.py b/wger/nutrition/api/filtersets.pyindex 4d86ad6fd..b6c5fb785 100644--- a/wger/nutrition/api/filtersets.py+++ b/wger/nutrition/api/filtersets.py@@ -23,6 +23,7 @@ from django.contrib.postgres.search import TrigramSimilarityfrom django_filters import rest_framework as filters# wger+from wger.core.models import Languagefrom wger.nutrition.models import (Ingredient,LogItem,@@ -98,7 +99,12 @@ class IngredientFilterSet(filters.FilterSet):Also accepts a comma-separated list of codes. Unknown codes are ignoredand duplicates removed."""- languages = [load_language(l) for l in set(value.split(','))]+ languages = []+ for code in set(value.split(',')):+ try:+ languages.append(load_language(code, default_to_english=False))+ except Language.DoesNotExist:+ passif languages:queryset = queryset.filter(language__in=languages)diff --git a/wger/nutrition/tests/test_search_api.py b/wger/nutrition/tests/test_search_api.pyindex 105354c45..7b8d48a57 100644--- a/wger/nutrition/tests/test_search_api.py+++ b/wger/nutrition/tests/test_search_api.py@@ -88,6 +88,15 @@ class SearchIngredientApiTestCase(BaseTestCase, ApiBaseTestCase):self.assertEqual(response.status_code, status.HTTP_200_OK)self.assertEqual(response.data['count'], 5)+ def test_search_only_unknown_language_codes(self):+ """+ When all language codes are unknown the filter has no effect, not a silent English fallback+ """+ response = self.client.get(self.url + '?name__search=guest&language__code=kg')++ self.assertEqual(response.status_code, status.HTTP_200_OK)+ self.assertEqual(response.data['count'], 7)+def test_search_all_languages(self):"""Disable all language filters