Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Remove username from weight overview URL

Roland Geider0c35b64d51d8
diff --git a/wger/core/templates/navigation.html b/wger/core/templates/navigation.html
index d59841bf4..c1b7b29ff 100644
--- a/wger/core/templates/navigation.html
+++ b/wger/core/templates/navigation.html
@@ -36,7 +36,7 @@
{% if user.is_authenticated %}
<li><a class="dropdown-item" href="{% url 'manager:workout:calendar' user.username %}" rel="nofollow">{% translate "Calendar" %}</a></li>
{% endif %}
-
+
<li><a class="dropdown-item" href="{% url 'gallery:images:overview' %}" rel="nofollow">
{% if not user.is_authenticated %}
<span class="{% fa_class 'lock' %}"></span>
@@ -73,12 +73,12 @@
{# #}
{% if user.is_authenticated %}
<li class="nav-item dropdown{% if active_tab == 'weight' %} active{% endif %}">
- <a href="{% url 'weight:overview' user.username %}"
+ <a href="{% url 'weight:overview' %}"
class="dropdown-toggle nav-link"
data-toggle="dropdown"
rel="nofollow">{% translate "Body weight" %} <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a class="dropdown-item" href="{% url 'weight:overview' user.username %}" rel="nofollow">{% translate "Weight overview" %}</a></li>
+ <li><a class="dropdown-item" href="{% url 'weight:overview' %}" rel="nofollow">{% translate "Weight overview" %}</a></li>
<li><a class="dropdown-item" href="{% url 'weight:add' %}" rel="nofollow">{% translate "Add weight entry" %}</a></li>
</ul>
</li>
diff --git a/wger/core/templates/user/overview.html b/wger/core/templates/user/overview.html
index 8c94f29a4..12951cb23 100644
--- a/wger/core/templates/user/overview.html
+++ b/wger/core/templates/user/overview.html
@@ -111,7 +111,7 @@
<h4>{% translate "Weight" %} <small>({% blocktranslate with number=5 %}last {{ number }}{% endblocktranslate %})</small></h4>
{% if perms.gym.gym_trainer %}
-<a href="{{trainer_login}}?next={% url 'weight:overview' current_user.username %}" class="btn btn-light btn-sm">{% translate "Weight overview" %}</a>
+<a href="{{trainer_login}}?next={% url 'weight:overview' %}" class="btn btn-light btn-sm">{% translate "Weight overview" %}</a>
{% endif %}
<table class="table">
diff --git a/wger/core/tests/test_temporary_users.py b/wger/core/tests/test_temporary_users.py
index bb06687d3..2df4870f3 100644
--- a/wger/core/tests/test_temporary_users.py
+++ b/wger/core/tests/test_temporary_users.py
@@ -149,7 +149,7 @@ class DemoUserTestCase(WgerTestCase):
self.assertEqual(self.count_temp_users(), 1)
self.user_logout()
- reverse('weight:overview', kwargs={'username': 'test'})
+ reverse('weight:overview')
self.assertEqual(self.count_temp_users(), 1)
self.user_logout()
diff --git a/wger/manager/templates/workout/email_weight_reminder.tpl b/wger/manager/templates/workout/email_weight_reminder.tpl
index d4c800044..dad2e0a44 100644
--- a/wger/manager/templates/workout/email_weight_reminder.tpl
+++ b/wger/manager/templates/workout/email_weight_reminder.tpl
@@ -12,6 +12,6 @@ option in your settings.{% endblocktranslate %}
— {% blocktranslate %}The {{ site }} team{% endblocktranslate %}
-* https://{{site}}{% url 'weight:overview' user.username %}
+* https://{{site}}{% url 'weight:overview' %}
* https://{{site}}{% url 'weight:add' %}
* https://{{site}}{% url 'core:user:preferences' %}
diff --git a/wger/weight/tests/test_entry.py b/wger/weight/tests/test_entry.py
index d8840df31..87a5a4d5f 100644
--- a/wger/weight/tests/test_entry.py
+++ b/wger/weight/tests/test_entry.py
@@ -43,48 +43,6 @@ class MealRepresentationTestCase(WgerTestCase):
self.assertEqual("{0}".format(WeightEntry.objects.get(pk=1)), '2012-10-01: 77.00 kg')
-class WeightEntryAccessTestCase(WgerTestCase):
- """
- Test accessing the weight overview page
- """
-
- def test_access_shared(self):
- """
- Test accessing the URL of a shared weight overview
- """
- url = reverse('weight:overview', kwargs={'username': 'admin'})
-
- self.user_login('admin')
- response = self.client.get(url)
- self.assertEqual(response.status_code, 200)
-
- self.user_login('test')
- response = self.client.get(url)
- self.assertEqual(response.status_code, 200)
-
- self.user_logout()
- response = self.client.get(url)
- self.assertEqual(response.status_code, 200)
-
- def test_access_not_shared(self):
- """
- Test accessing the URL of an unshared weight overview
- """
- url = reverse('weight:overview', kwargs={'username': 'test'})
-
- self.user_login('admin')
- response = self.client.get(url)
- self.assertEqual(response.status_code, 404)
-
- self.user_login('test')
- response = self.client.get(url)
- self.assertEqual(response.status_code, 200)
-
- self.user_logout()
- response = self.client.get(url)
- self.assertEqual(response.status_code, 404)
-
-
class AddWeightEntryTestCase(WgerAddTestCase):
"""
Tests adding a weight entry
diff --git a/wger/weight/tests/test_overview.py b/wger/weight/tests/test_overview.py
index 3c45c8a23..4aea9a23b 100644
--- a/wger/weight/tests/test_overview.py
+++ b/wger/weight/tests/test_overview.py
@@ -34,9 +34,7 @@ class WeightOverviewTestCase(WgerTestCase):
"""
Helper function to test the weight overview page
"""
- response = self.client.get(
- reverse('weight:overview', kwargs={'username': self.current_user})
- )
+ response = self.client.get(reverse('weight:overview'))
self.assertEqual(response.status_code, 200)
def test_weight_overview_loged_in(self):
diff --git a/wger/weight/urls.py b/wger/weight/urls.py
index b6ab1ef32..9667d9331 100644
--- a/wger/weight/urls.py
+++ b/wger/weight/urls.py
@@ -52,7 +52,7 @@ urlpatterns = [
name='import-csv',
),
url(
- r'^overview/(?P<username>[\w.@+-]+)$',
+ 'overview',
views.overview,
name='overview',
),
diff --git a/wger/weight/views.py b/wger/weight/views.py
index e17a84b2f..6afc81fd8 100644
--- a/wger/weight/views.py
+++ b/wger/weight/views.py
@@ -89,7 +89,7 @@ class WeightAddView(WgerFormMixin, CreateView):
"""
Return to overview with username
"""
- return reverse('weight:overview', kwargs={'username': self.object.user.username})
+ return reverse('weight:overview')
class WeightUpdateView(WgerFormMixin, LoginRequiredMixin, UpdateView):
@@ -109,7 +109,7 @@ class WeightUpdateView(WgerFormMixin, LoginRequiredMixin, UpdateView):
"""
Return to overview with username
"""
- return reverse('weight:overview', kwargs={'username': self.object.user.username})
+ return reverse('weight:overview')
class WeightDeleteView(WgerDeleteMixin, LoginRequiredMixin, DeleteView):
@@ -131,7 +131,7 @@ class WeightDeleteView(WgerDeleteMixin, LoginRequiredMixin, DeleteView):
"""
Return to overview with username
"""
- return reverse('weight:overview', kwargs={'username': self.object.user.username})
+ return reverse('weight:overview')
@login_required
@@ -164,7 +164,11 @@ def overview(request, username=None):
Shows a plot with the weight data
"""
is_owner, user = check_access(request.user, username)
- context = {'is_owner': is_owner, 'owner_user': user, 'show_shariff': False,}
+ context = {
+ 'is_owner': is_owner,
+ 'owner_user': user,
+ 'show_shariff': False,
+ }
return render(request, 'overview.html', context)
@@ -192,6 +196,4 @@ 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', kwargs={'username': request.user.username})
- )
+ return HttpResponseRedirect(reverse('weight:overview'))