Self hosted FLOSS fitness/workout, nutrition and weight tracker
Always use overview URL with username
Roland Geidere744beb347a7
diff --git a/wger/core/templates/navigation.html b/wger/core/templates/navigation.htmlindex e107aa40a..cb468f18b 100644--- a/wger/core/templates/navigation.html+++ b/wger/core/templates/navigation.html@@ -76,7 +76,7 @@{% if user.is_authenticated %}<li class="dropdown{% if active_tab == 'weight' %} active{% endif %}">- <a href="{% url 'weight:overview' %}"+ <a href="{% url 'weight:overview' user.username %}"class="dropdown-toggle"data-toggle="dropdown"rel="nofollow">{% trans "Weight" %} <b class="caret"></b></a>diff --git a/wger/weight/helpers.py b/wger/weight/helpers.pyindex 711c4ec3a..6c27acd67 100644--- a/wger/weight/helpers.py+++ b/wger/weight/helpers.py@@ -94,10 +94,12 @@ def group_log_entries(user, year, month, day=None):date__year=year,date__month=month)+ logs = logs.order_by('date', 'id')out = cache.get(cache_mapper.get_workout_log_list(log_hash))+ # out = OrderedDict()if not out:- out = {}+ out = OrderedDict()# Logsfor entry in logs:@@ -105,7 +107,7 @@ def group_log_entries(user, year, month, day=None):out[entry.date] = {'date': entry.date,'workout': entry.workout,'session': entry.get_workout_session(),- 'logs': {}}+ 'logs': OrderedDict()}if not out[entry.date]['logs'].get(entry.exercise):out[entry.date]['logs'][entry.exercise] = []diff --git a/wger/weight/tests/test_overview.py b/wger/weight/tests/test_overview.pyindex a3d16b5e7..13c822420 100644--- a/wger/weight/tests/test_overview.py+++ b/wger/weight/tests/test_overview.py@@ -30,7 +30,8 @@ class WeightOverviewTestCase(WorkoutManagerTestCase):'''Helper function to test the weight overview page'''- response = self.client.get(reverse('weight:overview'))+ response = self.client.get(reverse('weight:overview',+ kwargs={'username': self.current_user}))self.assertEqual(response.status_code, 200)def test_weight_overview_loged_in(self):diff --git a/wger/weight/urls.py b/wger/weight/urls.pyindex 8aa8f62ad..fc947adde 100644--- a/wger/weight/urls.py+++ b/wger/weight/urls.py@@ -41,9 +41,9 @@ urlpatterns = patterns('',url(r'^overview/(?P<username>[\w.@+-]+)$',views.overview,name='overview'),- url(r'^overview/$',- views.overview,- name='overview'),+ # url(r'^overview/$',+ # views.overview,+ # name='overview'),url(r'^api/get_weight_data/(?P<username>[\w.@+-]+)$', # JSviews.get_weight_data,name='weight-data'),diff --git a/wger/weight/views.py b/wger/weight/views.pyindex 9dd4e14ce..7dd769d38 100644--- a/wger/weight/views.py+++ b/wger/weight/views.py@@ -53,7 +53,6 @@ class WeightAddView(WgerFormMixin, CreateView):form_class = WeightFormtitle = ugettext_lazy('Add weight entry')form_action = reverse_lazy('weight:add')- success_url = reverse_lazy('weight:overview')def get_initial(self):'''@@ -72,6 +71,12 @@ class WeightAddView(WgerFormMixin, CreateView):form.instance.user = self.request.userreturn super(WeightAddView, self).form_valid(form)+ def get_success_url(self):+ '''+ Return to overview with username+ '''+ return reverse('weight:overview', kwargs={'username': self.object.user.username})+class WeightUpdateView(WgerFormMixin, UpdateView):'''@@ -79,7 +84,6 @@ class WeightUpdateView(WgerFormMixin, UpdateView):'''model = WeightEntryform_class = WeightForm- success_url = reverse_lazy('weight:overview')def get_context_data(self, **kwargs):context = super(WeightUpdateView, self).get_context_data(**kwargs)@@ -88,6 +92,12 @@ class WeightUpdateView(WgerFormMixin, UpdateView):return context+ def get_success_url(self):+ '''+ Return to overview with username+ '''+ return reverse('weight:overview', kwargs={'username': self.object.user.username})+@login_requireddef export_csv(request):@@ -199,4 +209,5 @@ class WeightCsvImportFormPreview(FormPreview):def done(self, request, cleaned_data):weight_list, error_list = helpers.parse_weight_csv(request, cleaned_data)WeightEntry.objects.bulk_create(weight_list)- return HttpResponseRedirect(reverse('weight:overview'))+ return HttpResponseRedirect(reverse('weight:overview',+ kwargs={'username': request.user.username}))