Self hosted FLOSS fitness/workout, nutrition and weight tracker
Merge branch 'master' into feature/pg-fulltext-search
Roland Geider007a09534acd
diff --cc wger/nutrition/api/views.pyindex d8244bfd9,77895c487..15c8dbe2c--- a/wger/nutrition/api/views.py+++ b/wger/nutrition/api/views.py@@@ -16,12 -16,23 +16,25 @@@# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.# Standard Library+ import logging+ from dataclasses import asdict+import datetime# Django+ from django.conf import settings+ from django.utils.decorators import method_decorator+ from django.views.decorators.cache import cache_page+from django.shortcuts import get_object_or_404# Third Party+ from drf_spectacular.types import OpenApiTypes+ from drf_spectacular.utils import (+ OpenApiParameter,+ extend_schema,+ inline_serializer,+ )+ from easy_thumbnails.alias import aliases+ from easy_thumbnails.files import get_thumbnailerfrom rest_framework import viewsetsfrom rest_framework.decorators import (action,@@@ -153,15 -217,24 +219,24 @@@ def search(request)if not term:return Response(json_response)- requested_language = request.GET.get('language', None)- language = load_language(requested_language)+ languages = [load_language(l) for l in language_codes.split(',')]ingredients = Ingredient.objects.filter(- name__icontains=term,+ search_column=term,- language=language,+ language__in=languages,status=Ingredient.STATUS_ACCEPTED,- )+ )[:100]for ingredient in ingredients:+ if hasattr(ingredient, 'image'):+ image_obj = ingredient.image+ image = image_obj.image.url+ t = get_thumbnailer(image_obj.image)+ thumbnail = t.get_thumbnail(aliases.get('micro_cropped')).url+ else:+ ingredient.get_image(request)+ image = None+ thumbnail = None+ingredient_json = {'value': ingredient.name,'data': {diff --cc wger/nutrition/models/ingredient.pyindex 1185d5e3d,6ab25fdd0..8331e8450--- a/wger/nutrition/models/ingredient.py+++ b/wger/nutrition/models/ingredient.py@@@ -50,9 -63,9 +65,8 @@@ from wger.utils.models import)# Local- from ..consts import ENERGY_FACTORfrom .ingredient_category import IngredientCategory-logger = logging.getLogger(__name__)