Self hosted FLOSS fitness/workout, nutrition and weight tracker
Update django-filter use
Scott Peshakdc8acc318c12
diff --git a/wger/core/api/views.py b/wger/core/api/views.pyindex 0a8994ff6..dfa860ba7 100644--- a/wger/core/api/views.py+++ b/wger/core/api/views.py@@ -83,7 +83,7 @@ class LanguageViewSet(viewsets.ReadOnlyModelViewSet):queryset = Language.objects.all()serializer_class = LanguageSerializerordering_fields = '__all__'- filter_fields = ('full_name',+ filterset_fields = ('full_name','short_name')@@ -94,7 +94,7 @@ class DaysOfWeekViewSet(viewsets.ReadOnlyModelViewSet):queryset = DaysOfWeek.objects.all()serializer_class = DaysOfWeekSerializerordering_fields = '__all__'- filter_fields = ('day_of_week', )+ filterset_fields = ('day_of_week', )class LicenseViewSet(viewsets.ReadOnlyModelViewSet):@@ -104,7 +104,7 @@ class LicenseViewSet(viewsets.ReadOnlyModelViewSet):queryset = License.objects.all()serializer_class = LicenseSerializerordering_fields = '__all__'- filter_fields = ('full_name',+ filterset_fields = ('full_name','short_name','url')@@ -116,7 +116,7 @@ class RepetitionUnitViewSet(viewsets.ReadOnlyModelViewSet):queryset = RepetitionUnit.objects.all()serializer_class = RepetitionUnitSerializerordering_fields = '__all__'- filter_fields = ('name', )+ filterset_fields = ('name', )class WeightUnitViewSet(viewsets.ReadOnlyModelViewSet):@@ -126,4 +126,4 @@ class WeightUnitViewSet(viewsets.ReadOnlyModelViewSet):queryset = WeightUnit.objects.all()serializer_class = WeightUnitSerializerordering_fields = '__all__'- filter_fields = ('name', )+ filterset_fields = ('name', )diff --git a/wger/exercises/api/views.py b/wger/exercises/api/views.pyindex c60483ca3..75ffbb304 100644--- a/wger/exercises/api/views.py+++ b/wger/exercises/api/views.py@@ -61,7 +61,7 @@ class ExerciseViewSet(viewsets.ModelViewSet):serializer_class = ExerciseSerializerpermission_classes = (IsAuthenticatedOrReadOnly, CreateOnlyPermission)ordering_fields = '__all__'- filter_fields = ('category',+ filterset_fields = ('category','creation_date','description','language',@@ -138,7 +138,7 @@ class ExerciseInfoViewset(viewsets.ModelViewSet):serializer_class = ExerciseInfoSerializerpermission_classes = (IsAuthenticatedOrReadOnly, CreateOnlyPermission)ordering_fields = '__all__'- filter_fields = ('category',+ filterset_fields = ('category','creation_date','description','language',@@ -158,7 +158,7 @@ class EquipmentViewSet(viewsets.ReadOnlyModelViewSet):queryset = Equipment.objects.all()serializer_class = EquipmentSerializerordering_fields = '__all__'- filter_fields = ('name',)+ filterset_fields = ('name',)class ExerciseCategoryViewSet(viewsets.ReadOnlyModelViewSet):@@ -168,7 +168,7 @@ class ExerciseCategoryViewSet(viewsets.ReadOnlyModelViewSet):queryset = ExerciseCategory.objects.all()serializer_class = ExerciseCategorySerializerordering_fields = '__all__'- filter_fields = ('name',)+ filterset_fields = ('name',)class ExerciseImageViewSet(viewsets.ModelViewSet):@@ -179,7 +179,7 @@ class ExerciseImageViewSet(viewsets.ModelViewSet):serializer_class = ExerciseImageSerializerpermission_classes = (IsAuthenticatedOrReadOnly, CreateOnlyPermission)ordering_fields = '__all__'- filter_fields = ('is_main',+ filterset_fields = ('is_main','status','exercise','license',@@ -222,7 +222,7 @@ class ExerciseCommentViewSet(viewsets.ReadOnlyModelViewSet):queryset = ExerciseComment.objects.all()serializer_class = ExerciseCommentSerializerordering_fields = '__all__'- filter_fields = ('comment',+ filterset_fields = ('comment','exercise')@@ -233,5 +233,5 @@ class MuscleViewSet(viewsets.ReadOnlyModelViewSet):queryset = Muscle.objects.all()serializer_class = MuscleSerializerordering_fields = '__all__'- filter_fields = ('name',+ filterset_fields = ('name','is_front')diff --git a/wger/manager/api/views.py b/wger/manager/api/views.pyindex b6bb27728..b38938f0a 100644--- a/wger/manager/api/views.py+++ b/wger/manager/api/views.py@@ -55,7 +55,7 @@ class WorkoutViewSet(viewsets.ModelViewSet):serializer_class = WorkoutSerializeris_private = Trueordering_fields = '__all__'- filter_fields = ('comment',+ filterset_fields = ('comment','creation_date')def get_queryset(self):@@ -89,7 +89,7 @@ class WorkoutSessionViewSet(WgerOwnerObjectModelViewSet):serializer_class = WorkoutSessionSerializeris_private = Trueordering_fields = '__all__'- filter_fields = ('date',+ filterset_fields = ('date','workout','notes','impression',@@ -123,7 +123,7 @@ class ScheduleStepViewSet(WgerOwnerObjectModelViewSet):serializer_class = ScheduleStepSerializeris_private = Trueordering_fields = '__all__'- filter_fields = ('schedule',+ filterset_fields = ('schedule','workout','duration','order')@@ -149,7 +149,7 @@ class ScheduleViewSet(viewsets.ModelViewSet):serializer_class = ScheduleSerializeris_private = Trueordering_fields = '__all__'- filter_fields = ('is_active',+ filterset_fields = ('is_active','is_loop','start_date','name')@@ -174,7 +174,7 @@ class DayViewSet(WgerOwnerObjectModelViewSet):serializer_class = DaySerializeris_private = Trueordering_fields = '__all__'- filter_fields = ('description',+ filterset_fields = ('description','training','day')@@ -198,7 +198,7 @@ class SetViewSet(WgerOwnerObjectModelViewSet):serializer_class = SetSerializeris_private = Trueordering_fields = '__all__'- filter_fields = ('exerciseday',+ filterset_fields = ('exerciseday','order','sets','exercises')@@ -223,7 +223,7 @@ class SettingViewSet(WgerOwnerObjectModelViewSet):serializer_class = SettingSerializeris_private = Trueordering_fields = '__all__'- filter_fields = ('exercise',+ filterset_fields = ('exercise','order','reps','weight',@@ -256,7 +256,7 @@ class WorkoutLogViewSet(WgerOwnerObjectModelViewSet):serializer_class = WorkoutLogSerializeris_private = Trueordering_fields = '__all__'- filter_fields = ('date',+ filterset_fields = ('date','exercise','reps','weight',diff --git a/wger/nutrition/api/views.py b/wger/nutrition/api/views.pyindex 4fbb746f0..86fc7fd03 100644--- a/wger/nutrition/api/views.py+++ b/wger/nutrition/api/views.py@@ -55,7 +55,7 @@ class IngredientViewSet(viewsets.ReadOnlyModelViewSet):queryset = Ingredient.objects.all()serializer_class = IngredientSerializerordering_fields = '__all__'- filter_fields = ('carbohydrates',+ filterset_fields = ('carbohydrates','carbohydrates_sugar','creation_date','energy',@@ -157,7 +157,7 @@ class WeightUnitViewSet(viewsets.ReadOnlyModelViewSet):queryset = WeightUnit.objects.all()serializer_class = WeightUnitSerializerordering_fields = '__all__'- filter_fields = ('language',+ filterset_fields = ('language','name')@@ -168,7 +168,7 @@ class IngredientWeightUnitViewSet(viewsets.ReadOnlyModelViewSet):queryset = IngredientWeightUnit.objects.all()serializer_class = IngredientWeightUnitSerializerordering_fields = '__all__'- filter_fields = ('amount',+ filterset_fields = ('amount','gram','ingredient','unit')@@ -181,7 +181,7 @@ class NutritionPlanViewSet(viewsets.ModelViewSet):serializer_class = NutritionPlanSerializeris_private = Trueordering_fields = '__all__'- filter_fields = ('creation_date',+ filterset_fields = ('creation_date','language','description','has_goal_calories')@@ -213,7 +213,7 @@ class MealViewSet(WgerOwnerObjectModelViewSet):serializer_class = MealSerializeris_private = Trueordering_fields = '__all__'- filter_fields = ('order',+ filterset_fields = ('order','plan','time')@@ -250,7 +250,7 @@ class MealItemViewSet(WgerOwnerObjectModelViewSet):serializer_class = MealItemSerializeris_private = Trueordering_fields = '__all__'- filter_fields = ('amount',+ filterset_fields = ('amount','ingredient','meal','order',diff --git a/wger/weight/api/views.py b/wger/weight/api/views.pyindex 7c7d1a9dd..29630db56 100644--- a/wger/weight/api/views.py+++ b/wger/weight/api/views.py@@ -30,7 +30,7 @@ class WeightEntryViewSet(viewsets.ModelViewSet):serializer_class = WeightEntrySerializeris_private = Trueordering_fields = '__all__'- filter_fields = ('date',+ filterset_fields = ('date','weight')def get_queryset(self):