Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Fix merge errors

Roland Geider9edc02a97b67
diff --git a/wger/exercises/api/serializers.py b/wger/exercises/api/serializers.py
index 295313012..2745c8015 100644
--- a/wger/exercises/api/serializers.py
+++ b/wger/exercises/api/serializers.py
@@ -21,7 +21,7 @@ from rest_framework import serializers
from wger.exercises.models import (
Equipment,
Exercise,
- ExerciseAlias,
+ Alias,
ExerciseBase,
ExerciseCategory,
ExerciseComment,
@@ -126,7 +126,7 @@ class ExerciseAliasSerializer(serializers.ModelSerializer):
"""
class Meta:
- model = ExerciseAlias
+ model = Alias
fields = ['id', 'exercise', 'alias']
@@ -148,7 +148,7 @@ class ExerciseInfoAliasSerializer(serializers.ModelSerializer):
"""
class Meta:
- model = ExerciseAlias
+ model = Alias
fields = ['id', 'alias']
@@ -244,7 +244,7 @@ class ExerciseInfoSerializer(serializers.ModelSerializer):
muscles_secondary = MuscleSerializer(many=True, read_only=True)
equipment = EquipmentSerializer(many=True, read_only=True)
variations = serializers.PrimaryKeyRelatedField(many=True, read_only=True)
- aliases = ExerciseInfoAliasSerializer(source='exercisealias_set', many=True, read_only=True)
+ aliases = ExerciseInfoAliasSerializer(source='alias_set', many=True, read_only=True)
class Meta:
model = Exercise
diff --git a/wger/exercises/api/views.py b/wger/exercises/api/views.py
index 9421be21e..37de9244f 100644
--- a/wger/exercises/api/views.py
+++ b/wger/exercises/api/views.py
@@ -164,7 +164,7 @@ def search(request):
languages = load_item_languages(
LanguageConfig.SHOW_ITEM_EXERCISES, language_code=request.GET.get('language', None)
)
- name_lookup = Q(name__icontains=q) | Q(exercisealias__alias__icontains=q)
+ name_lookup = Q(name__icontains=q) | Q(alias__alias__icontains=q)
exercises = (
Exercise.objects.filter(name_lookup).accepted().filter(
language__in=languages