Self hosted FLOSS fitness/workout, nutrition and weight tracker
Merge branch 'master' into feature/flexible-routines
Roland Geider37bf698441bf
diff --cc wger/core/templatetags/wger_extras.pyindex be61cb23e,e1fc622a2..6ff7d88ff--- a/wger/core/templatetags/wger_extras.py+++ b/wger/core/templatetags/wger_extras.py@@@ -26,7 -26,9 +26,8 @@@ from django.utils.translation importpgettext,)+ from wger.core.tests.base_testcase import get_reverse# wger-from wger.manager.models import Dayfrom wger.utils.constants import (PAGINATION_MAX_TOTAL_PAGES,PAGINATION_PAGES_AROUND_CURRENT,diff --cc wger/core/views/user.pyindex 119c2dfb6,143b08167..a40040ff8--- a/wger/core/views/user.py+++ b/wger/core/views/user.py@@@ -547,10 -546,10 +546,10 @@@ class UserDetailView(LoginRequiredMixin'last_log': logs.last(),})- context['workouts'] = out+ context['routine_data'] = outcontext['weight_entries'] = WeightEntry.objects.filter(user=self.object).order_by('-date')[- :5- ]+ :5+ ]context['nutrition_plans'] = NutritionPlan.objects.filter(user=self.object).order_by('-creation_date')[:5]