Self hosted FLOSS fitness/workout, nutrition and weight tracker
Merge branch 'master' into feature/flexible-routines
Roland Geider5c73bb174f85
diff --cc wger/core/views/user.pyindex a40040ff8,d7ffa51ef..625b64e1c--- a/wger/core/views/user.py+++ b/wger/core/views/user.py@@@ -546,10 -547,10 +547,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]