Self hosted FLOSS fitness/workout, nutrition and weight tracker
Formatting
Roland Geider7f12f66c9ea4
diff --git a/wger/core/demo.py b/wger/core/demo.pyindex 361fd9e2f..91fa2c810 100644--- a/wger/core/demo.py+++ b/wger/core/demo.py@@ -150,7 +150,9 @@ def create_demo_entries(user):day_set = Set(exerciseday=day, sets=4, order=3)day_set.save()- setting_list.append(Setting(set=day_set, exercise_base=exercise.exercise_base, reps=10, order=1))+ setting_list.append(+ Setting(set=day_set, exercise_base=exercise.exercise_base, reps=10, order=1)+ )# Weight log entriesfor reps in (5, 10, 12):@@ -173,9 +175,15 @@ def create_demo_entries(user):day_set = Set(exerciseday=day, sets=4, order=4)day_set.save()- setting_list.append(Setting(set=day_set, exercise_base=exercise.exercise_base, reps=30, order=1))- setting_list.append(Setting(set=day_set, exercise_base=exercise.exercise_base, reps=99, order=2))- setting_list.append(Setting(set=day_set, exercise_base=exercise.exercise_base, reps=35, order=3))+ setting_list.append(+ Setting(set=day_set, exercise_base=exercise.exercise_base, reps=30, order=1)+ )+ setting_list.append(+ Setting(set=day_set, exercise_base=exercise.exercise_base, reps=99, order=2)+ )+ setting_list.append(+ Setting(set=day_set, exercise_base=exercise.exercise_base, reps=35, order=3)+ )# Leg raises, supersets with crunchesif language.short_name == 'de':@@ -183,9 +191,15 @@ def create_demo_entries(user):else:exercise = Exercise.objects.get(pk=126)- setting_list.append(Setting(set=day_set, exercise_base=exercise.exercise_base, reps=30, order=1))- setting_list.append(Setting(set=day_set, exercise_base=exercise.exercise_base, reps=40, order=2))- setting_list.append(Setting(set=day_set, exercise_base=exercise.exercise_base, reps=99, order=3))+ setting_list.append(+ Setting(set=day_set, exercise_base=exercise.exercise_base, reps=30, order=1)+ )+ setting_list.append(+ Setting(set=day_set, exercise_base=exercise.exercise_base, reps=40, order=2)+ )+ setting_list.append(+ Setting(set=day_set, exercise_base=exercise.exercise_base, reps=99, order=3)+ )Setting.objects.bulk_create(setting_list)diff --git a/wger/exercises/api/views.py b/wger/exercises/api/views.pyindex 7d8f02a44..6b9286beb 100644--- a/wger/exercises/api/views.py+++ b/wger/exercises/api/views.py@@ -20,8 +20,8 @@ import logging# Djangofrom django.conf import settings-from django.utils.decorators import method_decoratorfrom django.db.models import Q+from django.utils.decorators import method_decoratorfrom django.utils.translation import gettext as _from django.views.decorators.cache import cache_page@@ -161,6 +161,7 @@ class ExerciseViewSet(viewsets.ReadOnlyModelViewSet):'language','name',)+@method_decorator(cache_page(settings.WGER_SETTINGS['EXERCISE_CACHE_TTL']))def dispatch(self, request, *args, **kwargs):return super().dispatch(request, *args, **kwargs)diff --git a/wger/manager/models/set.py b/wger/manager/models/set.pyindex f97847634..22617eeb4 100644--- a/wger/manager/models/set.py+++ b/wger/manager/models/set.py@@ -26,10 +26,7 @@ from django.db import modelsfrom django.utils.translation import gettext_lazy as _# wger-from wger.exercises.models import (- Exercise,- ExerciseBase,-)+from wger.exercises.models import ExerciseBasefrom wger.utils.cache import reset_workout_canonical_formfrom wger.utils.helpers import normalize_decimal