Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Use nested namespaces for core URLs

Roland Geider51e6938c5ae9
diff --git a/wger/config/tests/test_gym_config.py b/wger/config/tests/test_gym_config.py
index 4b89929c0..78aaf1bcf 100644
--- a/wger/config/tests/test_gym_config.py
+++ b/wger/config/tests/test_gym_config.py
@@ -45,7 +45,7 @@ class GymConfigTestCase(WorkoutManagerTestCase):
'password2': 'secret',
'email': '[email protected]',
'recaptcha_response_field': 'PASSED', }
- self.client.post(reverse('core:registration'), registration_data)
+ self.client.post(reverse('core:user:registration'), registration_data)
new_user = User.objects.all().last()
self.assertEqual(new_user.userprofile.gym, gym)
@@ -66,7 +66,7 @@ class GymConfigTestCase(WorkoutManagerTestCase):
'password2': 'secret',
'email': '[email protected]',
'recaptcha_response_field': 'PASSED', }
- self.client.post(reverse('core:registration'), registration_data)
+ self.client.post(reverse('core:user:registration'), registration_data)
new_user = User.objects.all().last()
self.assertEqual(new_user.userprofile.gym_id, None)
diff --git a/wger/core/templates/base.html b/wger/core/templates/base.html
index 92397f231..648375bc4 100644
--- a/wger/core/templates/base.html
+++ b/wger/core/templates/base.html
@@ -5,7 +5,7 @@
{% blocktrans with current_user=user|format_username %}You are
browsing the site as the user "{{current_user}}", all actions are performed on his data.
{% endblocktrans %}
- <a href="{% url 'core:trainer-login' trainer_identity %}" class="alert-link">{% trans "Back to own profile" %}</a>
+ <a href="{% url 'core:user:trainer-login' trainer_identity %}" class="alert-link">{% trans "Back to own profile" %}</a>
</div>
{% endif %}
<h2 id="page-title" class="page-header">{% block title %}{% endblock %}</h2>
diff --git a/wger/core/templates/license/list.html b/wger/core/templates/license/list.html
index 02566f2ef..cc20c86fa 100644
--- a/wger/core/templates/license/list.html
+++ b/wger/core/templates/license/list.html
@@ -19,7 +19,7 @@
{% for license in license_list %}
<tr>
<td class="no-hover">
- <a href="{% url 'core:license-delete' license.id %}"
+ <a href="{% url 'core:license:delete' license.id %}"
class="wger-modal-dialog">
<img src="{% static 'images/icons/trash.svg' %}"
width="22"
@@ -27,7 +27,7 @@
alt="{% trans 'Delete' %}"
title="{% trans 'Delete' %}">
</a>
- <a href="{% url 'core:license-edit' license.id %}"
+ <a href="{% url 'core:license:edit' license.id %}"
class="wger-modal-dialog">
<img src="{% static 'images/icons/edit.svg' %}"
width="22"
@@ -56,7 +56,7 @@
{% if perms.core.add_license %}
<h3>{% trans "Options" %}</h3>
<p>
- <a href="{% url 'core:license-add' %}"
+ <a href="{% url 'core:license:add' %}"
{% auto_link_css flavour "wger-modal-dialog" %}>
<img src="{% static 'images/icons/new.svg' %}"
width="32"
diff --git a/wger/core/templates/mobile/index.html b/wger/core/templates/mobile/index.html
index 72ae20555..3b62aec6c 100644
--- a/wger/core/templates/mobile/index.html
+++ b/wger/core/templates/mobile/index.html
@@ -234,7 +234,7 @@ its default duration in your settings.{% endblocktrans %}
<div class="row" style="margin-top: 1em;">
<div class="col-xs-6" style="padding-right: 7px;">
- <a href="{% url 'core:preferences' %}" class="btn btn-default btn-block">
+ <a href="{% url 'core:user:preferences' %}" class="btn btn-default btn-block">
<img src="{% static 'images/icons/preferences.svg' %}"
width="32"
height="32"
diff --git a/wger/core/templates/mobile/navigation.html b/wger/core/templates/mobile/navigation.html
index 90aa03309..876f4fe7c 100644
--- a/wger/core/templates/mobile/navigation.html
+++ b/wger/core/templates/mobile/navigation.html
@@ -173,9 +173,9 @@
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
- <li><a href="{% url 'core:login' %}">{% trans "Login" %}</a></li>
- <li><a href="{% url 'core:registration' %}">{% trans "Register" %}</a></li>
- <li><a href="{% url 'core:password_reset' %}">{% trans "Reset password" %}</a></li>
+ <li><a href="{% url 'core:user:login' %}">{% trans "Login" %}</a></li>
+ <li><a href="{% url 'core:user:registration' %}">{% trans "Register" %}</a></li>
+ <li><a href="{% url 'core:user:password_reset' %}">{% trans "Reset password" %}</a></li>
</ul>
</li>
{% else %}
@@ -190,11 +190,11 @@
</a>
<ul class="dropdown-menu">
<li>
- <a href="{% url 'core:preferences' %}">{% trans "My preferences" %}</a>
+ <a href="{% url 'core:user:preferences' %}">{% trans "My preferences" %}</a>
</li>
<li class="divider"></li>
<li>
- <a href="{% url 'core:logout' %}" class="browserid-logout">
+ <a href="{% url 'core:user:logout' %}" class="browserid-logout">
<span class="glyphicon glyphicon-log-out"></span>
{% trans "Logout" %}
</a>
@@ -210,7 +210,7 @@
<li><a href="{% url 'config:language:overview' %}">{% trans "Languages" %} </a></li>
{% endif %}
{% if perms.core.change_license %}
- <li><a href="{% url 'core:license-list' %}">{% trans "Licenses" %} </a></li>
+ <li><a href="{% url 'core:license:list' %}">{% trans "Licenses" %} </a></li>
{% endif %}
{% if perms.gym.manage_gyms %}
<li><a href="{% url 'gym:gym:list' %}">{% trans "Gyms" %} </a></li>
diff --git a/wger/core/templates/mobile/template.html b/wger/core/templates/mobile/template.html
index a760f24b6..0eed9e690 100644
--- a/wger/core/templates/mobile/template.html
+++ b/wger/core/templates/mobile/template.html
@@ -132,7 +132,7 @@
<div class="abox ainfo" style="padding:0.6em; margin: 0em 0em 1em 0em;text-align:center;font-size:95%;">
{% trans "You are using a guest account, data entered will be deleted after a week."%}
{% if not has_demo_data %}
- <a href="{% url 'core:demo-entries' %}" rel="nofollow" class="btn btn-success btn-xs">{% trans "Create some demo entries" %} »</a>
+ <a href="{% url 'core:user:demo-entries' %}" rel="nofollow" class="btn btn-success btn-xs">{% trans "Create some demo entries" %} »</a>
{% endif %}
</div>
{% endif %}
@@ -161,7 +161,7 @@
</div>
{% else %}
<div class="btn-group">
- <a href="{% url 'core:login' %}" {% auto_link_css flavour %}>{% trans "Login" %}</a>
+ <a href="{% url 'core:user:login' %}" {% auto_link_css flavour %}>{% trans "Login" %}</a>
</div>
<div class="btn-group">
<a href="{% url 'software:features' %}" {% auto_link_css flavour %}>{% trans "Features" %}</a>
diff --git a/wger/core/templates/navigation.html b/wger/core/templates/navigation.html
index ca79f23f0..753accb43 100644
--- a/wger/core/templates/navigation.html
+++ b/wger/core/templates/navigation.html
@@ -138,9 +138,9 @@
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
- <li><a href="{% url 'core:login' %}">{% trans "Login" %}</a></li>
- <li><a href="{% url 'core:registration' %}">{% trans "Register" %}</a></li>
- <li><a href="{% url 'core:password_reset' %}">{% trans "Reset password" %}</a></li>
+ <li><a href="{% url 'core:user:login' %}">{% trans "Login" %}</a></li>
+ <li><a href="{% url 'core:user:registration' %}">{% trans "Register" %}</a></li>
+ <li><a href="{% url 'core:user:password_reset' %}">{% trans "Reset password" %}</a></li>
</ul>
</li>
</ul>
@@ -153,12 +153,12 @@
</a>
<ul class="dropdown-menu">
<li>
- <a href="{% url 'core:preferences' %}">{% trans "My preferences" %}</a>
+ <a href="{% url 'core:user:preferences' %}">{% trans "My preferences" %}</a>
</li>
{% if not trainer_identity %}
<li class="divider"></li>
<li>
- <a href="{% url 'core:logout' %}" class="browserid-logout">
+ <a href="{% url 'core:user:logout' %}" class="browserid-logout">
<span class="glyphicon glyphicon-log-out"></span>
{% trans "Logout" %}
</a>
@@ -175,7 +175,7 @@
<li><a href="{% url 'config:language:overview' %}">{% trans "Languages" %} </a></li>
{% endif %}
{% if perms.core.change_license %}
- <li><a href="{% url 'core:license-list' %}">{% trans "Licenses" %} </a></li>
+ <li><a href="{% url 'core:license:list' %}">{% trans "Licenses" %} </a></li>
{% endif %}
{% if perms.gym.manage_gyms %}
<li><a href="{% url 'gym:gym:list' %}">{% trans "Gyms" %} </a></li>
diff --git a/wger/core/templates/template.html b/wger/core/templates/template.html
index 92f0c9001..33e6a3560 100644
--- a/wger/core/templates/template.html
+++ b/wger/core/templates/template.html
@@ -153,7 +153,7 @@
<div class="abox ainfo" style="padding:0.6em; margin: 0em 0em 1em 0em;text-align:center;font-size:95%;">
{% trans "You are using a guest account, data entered will be deleted after a week."%}
{% if not has_demo_data %}
- <a href="{% url 'core:demo-entries' %}" rel="nofollow" class="btn btn-success btn-xs">{% trans "Create some demo entries" %} »</a>
+ <a href="{% url 'core:user:demo-entries' %}" rel="nofollow" class="btn btn-success btn-xs">{% trans "Create some demo entries" %} »</a>
{% endif %}
</div>
{% endif %}
diff --git a/wger/core/templates/user/api_key.html b/wger/core/templates/user/api_key.html
index d8802abb6..7fbf803f0 100644
--- a/wger/core/templates/user/api_key.html
+++ b/wger/core/templates/user/api_key.html
@@ -45,9 +45,9 @@ curl -X GET https://wger.de/api/v2/workout/ \
<p>
{% if token %}
- <a href="{% url 'core:api-key' %}?new_key=true" class="btn btn-block btn-default">{% trans 'Delete current API key and generate new one' %}</a>
+ <a href="{% url 'core:user:api-key' %}?new_key=true" class="btn btn-block btn-default">{% trans 'Delete current API key and generate new one' %}</a>
{% else %}
- <a href="{% url 'core:api-key' %}?new_key=true" class="btn btn-block btn-default">{% trans 'Generate new API key' %}</a>
+ <a href="{% url 'core:user:api-key' %}?new_key=true" class="btn btn-block btn-default">{% trans 'Generate new API key' %}</a>
{% endif %}
</p>
diff --git a/wger/core/templates/user/change_password.html b/wger/core/templates/user/change_password.html
index ae58a05bf..e1cf7a3fb 100644
--- a/wger/core/templates/user/change_password.html
+++ b/wger/core/templates/user/change_password.html
@@ -6,7 +6,7 @@
{% block content %}
-<form action="{% url 'core:change-password' %}"
+<form action="{% url 'core:user:change-password' %}"
method="post"
class="form-horizontal"
role="form">
diff --git a/wger/core/templates/user/login.html b/wger/core/templates/user/login.html
index ff7395bac..03dac47a5 100644
--- a/wger/core/templates/user/login.html
+++ b/wger/core/templates/user/login.html
@@ -17,7 +17,7 @@
{% endblock %}
{% block content %}
-<form action="{% url 'core:login' %}{% if next %}?next={{next}}{% endif %}"
+<form action="{% url 'core:user:login' %}{% if next %}?next={{next}}{% endif %}"
method="post"
class="form-horizontal">
{% trans 'Login' as submit_text %}
@@ -53,7 +53,7 @@
{% block sidebar %}
<h3>{% trans "No account?" %}</h3>
<p>
- <a href="{% url 'core:registration' %}" {% auto_link_css flavour %}>
+ <a href="{% url 'core:user:registration' %}" {% auto_link_css flavour %}>
<img src="{% static 'images/icons/register.svg' %}"
width="32"
height="32"
@@ -63,7 +63,7 @@
<h3>{% trans "Forgot password?" %}</h3>
<p>
- <a href="{% url 'core:password_reset' %}" {% auto_link_css flavour %}>
+ <a href="{% url 'core:user:password_reset' %}" {% auto_link_css flavour %}>
<img src="{% static 'images/icons/reset-password.svg' %}"
width="32"
height="32"
diff --git a/wger/core/templates/user/overview.html b/wger/core/templates/user/overview.html
index 9818a04e9..771e3f31a 100644
--- a/wger/core/templates/user/overview.html
+++ b/wger/core/templates/user/overview.html
@@ -11,12 +11,12 @@
{% breadcrumb "Gyms" "gym:gym:list" %}
{% endif %}
{% breadcrumb_raw current_user.userprofile.gym "gym:gym:user-list" current_user.userprofile.gym.pk %}
- {% breadcrumb_raw current_user|format_username "core:user-overview" current_user.pk %}
+ {% breadcrumb_raw current_user|format_username "core:user:overview" current_user.pk %}
{% endblock %}
{% block content %}
-{% url 'core:trainer-login' current_user.pk as trainer_login %}
+{% url 'core:user:trainer-login' current_user.pk as trainer_login %}
<h3>{% trans "Workouts" %} <small>({% trans "last 10" %})</small></h3>
@@ -178,14 +178,14 @@
</button>
<ul class="dropdown-menu" role="menu">
<li>
- <a href="{% url 'core:user-edit' current_user.pk %}" class="wger-modal-dialog">{% trans "Edit"%}</a>
+ <a href="{% url 'core:user:edit' current_user.pk %}" class="wger-modal-dialog">{% trans "Edit"%}</a>
</li>
<li class="divider"></li>
<li>
{% if current_user.is_active %}
- <a href="{% url 'core:user-deactivate' current_user.pk %}" >{% trans "Deactivate user"%}</a>
+ <a href="{% url 'core:user:deactivate' current_user.pk %}" >{% trans "Deactivate user"%}</a>
{% else %}
- <a href="{% url 'core:user-activate' current_user.pk %}">{% trans "Activate user"%}</a>
+ <a href="{% url 'core:user:activate' current_user.pk %}">{% trans "Activate user"%}</a>
{% endif %}
</li>
{% if perms.gym.manage_gym or perms.gym.manage_gyms %}
@@ -194,7 +194,7 @@
</li>
{% endif %}
<li>
- <a href="{% url 'core:user-delete' current_user.pk %}" class="wger-modal-dialog">{% trans "Delete"%}</a>
+ <a href="{% url 'core:user:delete' current_user.pk %}" class="wger-modal-dialog">{% trans "Delete"%}</a>
</li>
</ul>
</div>
diff --git a/wger/core/templates/user/password_reset_complete.html b/wger/core/templates/user/password_reset_complete.html
index 2a3c0ff05..db6a23a22 100644
--- a/wger/core/templates/user/password_reset_complete.html
+++ b/wger/core/templates/user/password_reset_complete.html
@@ -7,6 +7,6 @@
{% block content %}
<p>{% trans "Your password has been set. You may go ahead and log in now." %}</p>
-<p><a href="{% url 'core:login' %}">{% trans 'Log in' %}</a></p>
+<p><a href="{% url 'core:user:login' %}">{% trans 'Log in' %}</a></p>
{% endblock %}
diff --git a/wger/core/templates/user/password_reset_email.html b/wger/core/templates/user/password_reset_email.html
index d46952224..6c26c4975 100644
--- a/wger/core/templates/user/password_reset_email.html
+++ b/wger/core/templates/user/password_reset_email.html
@@ -3,7 +3,7 @@
{% trans "Please go to the following page and choose a new password:" %}
{% block reset_link %}
-{{ protocol }}://{{ domain }}{% url 'core:password_reset_confirm' uidb64=uid token=token %}
+{{ protocol }}://{{ domain }}{% url 'core:user:password_reset_confirm' uidb64=uid token=token %}
{% endblock %}
{% trans "Your username, in case you've forgotten:" %} {{ user.username }}
diff --git a/wger/core/templates/user/preferences.html b/wger/core/templates/user/preferences.html
index 4cff9029e..5d35e444d 100644
--- a/wger/core/templates/user/preferences.html
+++ b/wger/core/templates/user/preferences.html
@@ -18,7 +18,7 @@ $(function() {
{% block content %}
-<form action="{% url 'core:preferences' %}"
+<form action="{% url 'core:user:preferences' %}"
method="post"
class="form-horizontal">
{% csrf_token %}
@@ -109,7 +109,7 @@ $(function() {
{% block sidebar %}
<h3>{% trans "Options" %}</h3>
<p>
- <a href="{% url 'core:logout' %}" {% auto_link_css flavour "browserid-logout" %}>
+ <a href="{% url 'core:user:logout' %}" {% auto_link_css flavour "browserid-logout" %}>
<img src="{% static 'images/icons/logout.svg' %}"
width="32"
height="32"
@@ -118,7 +118,7 @@ $(function() {
{% trans "Logout" %}</a>
</p>
<p>
- <a href="{% url 'core:change-password' %}" {% auto_link_css flavour "wger-modal-dialog" %}>
+ <a href="{% url 'core:user:change-password' %}" {% auto_link_css flavour "wger-modal-dialog" %}>
<img src="{% static 'images/icons/preferences.svg' %}"
width="32"
height="32"
@@ -127,7 +127,7 @@ $(function() {
{% trans "Change password" %}</a>
</p>
<p>
- <a href="{% url 'core:api-key' %}" {% auto_link_css flavour %}>
+ <a href="{% url 'core:user:api-key' %}" {% auto_link_css flavour %}>
<img src="{% static 'images/icons/internet.svg' %}"
width="32"
height="32"
@@ -137,7 +137,7 @@ $(function() {
</p>
<p style="margin-top: 2em;">
- <a href="{% url 'core:user-delete' %}" {% auto_link_css flavour "wger-modal-dialog" %}>
+ <a href="{% url 'core:user:delete' %}" {% auto_link_css flavour "wger-modal-dialog" %}>
<img src="{% static 'images/icons/trash.svg' %}"
width="32"
height="32"
diff --git a/wger/core/tests/test_apikey.py b/wger/core/tests/test_apikey.py
index f6847e0e1..2175f52e8 100644
--- a/wger/core/tests/test_apikey.py
+++ b/wger/core/tests/test_apikey.py
@@ -38,14 +38,14 @@ class ApiKeyTestCase(WorkoutManagerTestCase):
user = User.objects.get(username='test')
# User already has a key
- response = self.client.get(reverse('core:api-key'))
+ response = self.client.get(reverse('core:user:api-key'))
self.assertEqual(response.status_code, 200)
self.assertContains(response, 'Delete current API key and generate new one')
self.assertTrue(Token.objects.get(user=user))
# User has no keys
Token.objects.get(user=user).delete()
- response = self.client.get(reverse('core:api-key'))
+ response = self.client.get(reverse('core:user:api-key'))
self.assertEqual(response.status_code, 200)
self.assertContains(response, 'You have no API key yet')
self.assertRaises(Token.DoesNotExist, Token.objects.get, user=user)
@@ -59,7 +59,7 @@ class ApiKeyTestCase(WorkoutManagerTestCase):
user = User.objects.get(username='test')
key_before = Token.objects.get(user=user)
- response = self.client.get(reverse('core:api-key'), {'new_key': True})
+ response = self.client.get(reverse('core:user:api-key'), {'new_key': True})
self.assertEqual(response.status_code, 302)
response = self.client.get(response['Location'])
self.assertEqual(response.status_code, 200)
diff --git a/wger/core/tests/test_change_password.py b/wger/core/tests/test_change_password.py
index cdbd181c0..2e4c2bec2 100644
--- a/wger/core/tests/test_change_password.py
+++ b/wger/core/tests/test_change_password.py
@@ -30,7 +30,7 @@ class ChangePasswordTestCase(WorkoutManagerTestCase):
def change_password(self, fail=True):
# Fetch the change passwort page
- response = self.client.get(reverse('core:change-password'))
+ response = self.client.get(reverse('core:user:change-password'))
if fail:
self.assertEqual(response.status_code, 302)
@@ -42,7 +42,7 @@ class ChangePasswordTestCase(WorkoutManagerTestCase):
'new_password1': 'secret',
'new_password2': 'secret'}
- response = self.client.post(reverse('core:change-password'), form_data)
+ response = self.client.post(reverse('core:user:change-password'), form_data)
self.assertEqual(response.status_code, 302)
# Check the new password was accepted
diff --git a/wger/core/tests/test_delete_user.py b/wger/core/tests/test_delete_user.py
index d73446faa..a744e9066 100644
--- a/wger/core/tests/test_delete_user.py
+++ b/wger/core/tests/test_delete_user.py
@@ -37,7 +37,7 @@ class DeleteUserTestCase(WorkoutManagerTestCase):
'''
Helper function
'''
- response = self.client.get(reverse('core:user-delete'))
+ response = self.client.get(reverse('core:user:delete'))
self.assertEqual(User.objects.filter(username='test').count(), 1)
if fail:
self.assertEqual(response.status_code, 302)
@@ -46,13 +46,13 @@ class DeleteUserTestCase(WorkoutManagerTestCase):
# Wrong user password
if not fail:
- response = self.client.post(reverse('core:user-delete'),
+ response = self.client.post(reverse('core:user:delete'),
{'password': 'not the user password'})
self.assertEqual(response.status_code, 200)
self.assertEqual(User.objects.filter(username='test').count(), 1)
# Correct user password
- response = self.client.post(reverse('core:user-delete'), {'password': 'testtest'})
+ response = self.client.post(reverse('core:user:delete'), {'password': 'testtest'})
self.assertEqual(response.status_code, 302)
if fail:
self.assertEqual(User.objects.filter(username='test').count(), 1)
@@ -82,7 +82,7 @@ class DeleteUserByAdminTestCase(WorkoutManagerTestCase):
'''
Helper function
'''
- response = self.client.get(reverse('core:user-delete', kwargs={'user_pk': 2}))
+ response = self.client.get(reverse('core:user:delete', kwargs={'user_pk': 2}))
self.assertEqual(User.objects.filter(username='test').count(), 1)
if fail:
self.assertIn(response.status_code, (302, 403))
@@ -91,13 +91,13 @@ class DeleteUserByAdminTestCase(WorkoutManagerTestCase):
# Wrong admin password
if not fail:
- response = self.client.post(reverse('core:user-delete', kwargs={'user_pk': 2}),
+ response = self.client.post(reverse('core:user:delete', kwargs={'user_pk': 2}),
{'password': 'blargh'})
self.assertEqual(response.status_code, 200)
self.assertEqual(User.objects.filter(username='test').count(), 1)
# Correct user password
- response = self.client.post(reverse('core:user-delete', kwargs={'user_pk': 2}),
+ response = self.client.post(reverse('core:user:delete', kwargs={'user_pk': 2}),
{'password': self.current_password})
if fail:
self.assertIn(response.status_code, (302, 403))
diff --git a/wger/core/tests/test_license.py b/wger/core/tests/test_license.py
index d97bb4165..58e5890ff 100644
--- a/wger/core/tests/test_license.py
+++ b/wger/core/tests/test_license.py
@@ -27,7 +27,7 @@ class LicenseOverviewTest(WorkoutManagerAccessTestCase):
Tests the licese overview page
'''
- url = 'core:license-list'
+ url = 'core:license:list'
anonymous_fail = True
@@ -37,7 +37,7 @@ class AddLicenseTestCase(WorkoutManagerAddTestCase):
'''
object_class = License
- url = 'core:license-add'
+ url = 'core:license:add'
data = {'full_name': 'Something here',
'short_name': 'SH'}
@@ -48,7 +48,7 @@ class DeleteLicenseTestCase(WorkoutManagerDeleteTestCase):
'''
object_class = License
- url = 'core:license-delete'
+ url = 'core:license:delete'
pk = 1
@@ -58,7 +58,7 @@ class EditLicenseTestCase(WorkoutManagerEditTestCase):
'''
object_class = License
- url = 'core:license-edit'
+ url = 'core:license:edit'
pk = 1
data = {'full_name': 'Something here 1.1',
'short_name': 'SH 1.1'}
diff --git a/wger/core/tests/test_preferences.py b/wger/core/tests/test_preferences.py
index e9f7061bf..abe84f3ec 100644
--- a/wger/core/tests/test_preferences.py
+++ b/wger/core/tests/test_preferences.py
@@ -39,7 +39,7 @@ class PreferencesTestCase(WorkoutManagerTestCase):
'''
self.user_login('test')
- response = self.client.get(reverse('core:preferences'))
+ response = self.client.get(reverse('core:user:preferences'))
profile = User.objects.get(username='test').userprofile
self.assertFalse(profile.show_comments)
@@ -48,7 +48,7 @@ class PreferencesTestCase(WorkoutManagerTestCase):
self.assertTemplateUsed('preferences.html')
# Change some preferences
- response = self.client.post(reverse('core:preferences'),
+ response = self.client.post(reverse('core:user:preferences'),
{'show_comments': True,
'show_english_ingredients': True,
'email': '[email protected]',
@@ -60,7 +60,7 @@ class PreferencesTestCase(WorkoutManagerTestCase):
'timer_pause': 100})
self.assertEqual(response.status_code, 302)
- response = self.client.get(reverse('core:preferences'))
+ response = self.client.get(reverse('core:user:preferences'))
profile = User.objects.get(username='test').userprofile
self.assertTrue(profile.show_english_ingredients)
self.assertTrue(profile.workout_reminder_active)
@@ -69,7 +69,7 @@ class PreferencesTestCase(WorkoutManagerTestCase):
self.assertEqual(User.objects.get(username='test').email, '[email protected]')
# Change some preferences
- response = self.client.post(reverse('core:preferences'),
+ response = self.client.post(reverse('core:user:preferences'),
{'show_comments': False,
'show_english_ingredients': True,
'email': '',
@@ -81,7 +81,7 @@ class PreferencesTestCase(WorkoutManagerTestCase):
'timer_pause': 40})
self.assertEqual(response.status_code, 302)
- response = self.client.get(reverse('core:preferences'))
+ response = self.client.get(reverse('core:user:preferences'))
profile = response.context['user'].userprofile
self.assertFalse(profile.show_comments)
self.assertTrue(profile.show_english_ingredients)
diff --git a/wger/core/tests/test_registration.py b/wger/core/tests/test_registration.py
index a8966d6a6..aff67e020 100644
--- a/wger/core/tests/test_registration.py
+++ b/wger/core/tests/test_registration.py
@@ -30,7 +30,7 @@ class RegistrationTestCase(WorkoutManagerTestCase):
def test_register(self):
# Fetch the registration page
- response = self.client.get(reverse('core:registration'))
+ response = self.client.get(reverse('core:user:registration'))
self.assertEqual(response.status_code, 200)
# Fill in the registration form
@@ -42,20 +42,20 @@ class RegistrationTestCase(WorkoutManagerTestCase):
count_before = User.objects.count()
# Wrong email
- response = self.client.post(reverse('core:registration'), registration_data)
+ response = self.client.post(reverse('core:user:registration'), registration_data)
self.assertFalse(response.context['form'].is_valid())
self.user_logout()
# Correct email
registration_data['email'] = '[email protected]'
- response = self.client.post(reverse('core:registration'), registration_data)
+ response = self.client.post(reverse('core:user:registration'), registration_data)
count_after = User.objects.count()
self.assertEqual(response.status_code, 302)
self.assertEqual(count_before + 1, count_after)
self.user_logout()
# Username already exists
- response = self.client.post(reverse('core:registration'), registration_data)
+ response = self.client.post(reverse('core:user:registration'), registration_data)
count_after = User.objects.count()
self.assertFalse(response.context['form'].is_valid())
self.assertEqual(response.status_code, 200)
@@ -63,7 +63,7 @@ class RegistrationTestCase(WorkoutManagerTestCase):
# Email already exists
registration_data['username'] = 'my.other.username'
- response = self.client.post(reverse('core:registration'), registration_data)
+ response = self.client.post(reverse('core:user:registration'), registration_data)
count_after = User.objects.count()
self.assertFalse(response.context['form'].is_valid())
self.assertEqual(response.status_code, 200)
@@ -71,13 +71,13 @@ class RegistrationTestCase(WorkoutManagerTestCase):
# No email
registration_data['email'] = ''
- response = self.client.post(reverse('core:registration'), registration_data)
+ response = self.client.post(reverse('core:user:registration'), registration_data)
count_after = User.objects.count()
self.assertEqual(response.status_code, 302)
self.assertEqual(count_before + 2, count_after)
# Already logged in
- response = self.client.post(reverse('core:registration'), registration_data)
+ response = self.client.post(reverse('core:user:registration'), registration_data)
count_after = User.objects.count()
self.assertEqual(response.status_code, 302)
self.assertEqual(count_before + 2, count_after)
diff --git a/wger/core/tests/test_user.py b/wger/core/tests/test_user.py
index da752b4bb..25233fad3 100644
--- a/wger/core/tests/test_user.py
+++ b/wger/core/tests/test_user.py
@@ -39,7 +39,7 @@ class StatusUserTestCase(WorkoutManagerTestCase):
user.save()
self.assertFalse(user.is_active)
- response = self.client.get(reverse('core:user-activate', kwargs={'pk': user.pk}))
+ response = self.client.get(reverse('core:user:activate', kwargs={'pk': user.pk}))
user = User.objects.get(pk=2)
if fail:
@@ -76,7 +76,7 @@ class StatusUserTestCase(WorkoutManagerTestCase):
user = User.objects.get(pk=2)
self.assertTrue(user.is_active)
- response = self.client.get(reverse('core:user-deactivate', kwargs={'pk': user.pk}))
+ response = self.client.get(reverse('core:user:deactivate', kwargs={'pk': user.pk}))
user = User.objects.get(pk=2)
if fail:
@@ -113,7 +113,7 @@ class EditUserTestCase(WorkoutManagerEditTestCase):
'''
object_class = User
- url = 'core:user-edit'
+ url = 'core:user:edit'
pk = 2
data = {'email': '[email protected]',
'first_name': 'Name',
diff --git a/wger/core/urls.py b/wger/core/urls.py
index a968f3e0f..1e4e0f0ee 100644
--- a/wger/core/urls.py
+++ b/wger/core/urls.py
@@ -24,70 +24,108 @@ from wger.core.views import user
from wger.core.views import misc
from wger.core.views import license
-
-urlpatterns = patterns('',
-
- # The landing page
- url(r'^$',
- misc.index,
- name='index'),
-
- # The dashboard
- url(r'^dashboard$',
- misc.dashboard,
- name='dashboard'),
-
- # User
- url(r'^user/delete$',
- user.delete,
- name='user-delete'),
- url(r'^user/(?P<user_pk>\d+)/delete$',
- user.delete,
- name='user-delete'),
- url(r'^user/logout$',
+# sub patterns for languages
+patterns_user = patterns('',
+ url(r'^login$',
+ user.login,
+ name='login'),
+ url(r'^logout$',
user.logout,
name='logout'),
- url(r'^user/(?P<user_pk>\d+)/trainer-login$',
+ url(r'^delete$',
+ user.delete,
+ name='delete'),
+ url(r'^(?P<user_pk>\d+)/delete$',
+ user.delete,
+ name='delete'),
+ url(r'^(?P<user_pk>\d+)/trainer-login$',
user.trainer_login,
name='trainer-login'),
- url(r'^user/registration$',
+ url(r'^registration$',
user.registration,
name='registration'),
- url(r'^user/preferences$',
+ url(r'^preferences$',
user.preferences,
name='preferences'),
- url(r'^user/api-key$',
+ url(r'^api-key$',
user.api_key,
name='api-key'),
- url(r'^user/demo-entries$',
+ url(r'^demo-entries$',
misc.demo_entries,
name='demo-entries'),
- url(r'^user/(?P<pk>\d+)/activate',
+ url(r'^(?P<pk>\d+)/activate',
user.UserActivateView.as_view(),
- name='user-activate'),
- url(r'^user/(?P<pk>\d+)/deactivate',
+ name='activate'),
+ url(r'^(?P<pk>\d+)/deactivate',
user.UserDeactivateView.as_view(),
- name='user-deactivate'),
- url(r'^user/(?P<pk>\d+)/edit',
+ name='deactivate'),
+ url(r'^(?P<pk>\d+)/edit',
user.UserEditView.as_view(),
- name='user-edit'),
- url(r'^user/(?P<pk>\d+)/overview',
+ name='edit'),
+ url(r'^(?P<pk>\d+)/overview',
user.UserDetailView.as_view(),
- name='user-overview'),
+ name='overview'),
- # Licenses
+ # Password reset is implemented by Django, no need to cook our own soup here
+ # (besides the templates)
+ url(r'^password/change$',
+ views.password_change,
+ {'template_name': 'user/change_password.html',
+ 'post_change_redirect': reverse_lazy('core:user:preferences')},
+ name='change-password'),
+ url(r'^password/reset/$',
+ views.password_reset,
+ {'template_name': 'user/password_reset_form.html',
+ 'email_template_name': 'user/password_reset_email.html',
+ 'post_reset_redirect': reverse_lazy('core:user:password_reset_done')},
+ name='password_reset'),
+ url(r'^password/reset/done/$',
+ views.password_reset_done,
+ {'template_name': 'user/password_reset_done.html'},
+ name='password_reset_done'),
+ url(r'^password/reset/check/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})$',
+ views.password_reset_confirm,
+ {'template_name': 'user/password_reset_confirm.html',
+ 'post_reset_redirect': reverse_lazy('core:user:password_reset_complete')},
+ name='password_reset_confirm'),
+ url(r'^password/reset/complete/$',
+ views.password_reset_complete,
+ {'template_name': 'user/password_reset_complete.html'},
+ name='password_reset_complete'),
+)
+
+
+# sub patterns for licenses
+patterns_license = patterns('',
url(r'^license/list$',
license.LicenseListView.as_view(),
- name='license-list'),
+ name='list'),
url(r'^license/add$',
license.LicenseAddView.as_view(),
- name='license-add'),
+ name='add'),
url(r'^license/(?P<pk>\d+)/edit',
license.LicenseUpdateView.as_view(),
- name='license-edit'),
+ name='edit'),
url(r'^license/(?P<pk>\d+)/delete',
license.LicenseDeleteView.as_view(),
- name='license-delete'),
+ name='delete'),
+)
+
+
+#
+# Actual patterns
+#
+urlpatterns = patterns('',
+
+ # The landing page
+ url(r'^$',
+ misc.index,
+ name='index'),
+
+ # The dashboard
+ url(r'^dashboard$',
+ misc.dashboard,
+ name='dashboard'),
# Others
url(r'^about$',
@@ -99,41 +137,7 @@ urlpatterns = patterns('',
url(r'^feedback$',
misc.FeedbackClass.as_view(),
name='feedback'),
-)
-# Password reset is implemented by Django, no need to cook our own soup here
-# (besides the templates)
-urlpatterns = urlpatterns + patterns('',
- url(r'^user/login$',
- user.login,
- name='login'),
-
- url(r'^user/password/change$',
- views.password_change,
- {'template_name': 'user/change_password.html',
- 'post_change_redirect': reverse_lazy('core:preferences')},
- name='change-password'),
-
- url(r'^user/password/reset/$',
- views.password_reset,
- {'template_name': 'user/password_reset_form.html',
- 'email_template_name': 'user/password_reset_email.html',
- 'post_reset_redirect': reverse_lazy('core:password_reset_done')},
- name='password_reset'),
-
- url(r'^user/password/reset/done/$',
- views.password_reset_done,
- {'template_name': 'user/password_reset_done.html'},
- name='password_reset_done'),
-
- url(r'^user/password/reset/check/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})$',
- views.password_reset_confirm,
- {'template_name': 'user/password_reset_confirm.html',
- 'post_reset_redirect': reverse_lazy('core:password_reset_complete')},
- name='password_reset_confirm'),
-
- url(r'^user/password/reset/complete/$',
- views.password_reset_complete,
- {'template_name': 'user/password_reset_complete.html'},
- name='password_reset_complete'),
+ url(r'^user/', include(patterns_user, namespace="user")),
+ url(r'^license/', include(patterns_license, namespace="license")),
)
diff --git a/wger/core/views/license.py b/wger/core/views/license.py
index 916e62b66..710c8b6ab 100644
--- a/wger/core/views/license.py
+++ b/wger/core/views/license.py
@@ -50,9 +50,9 @@ class LicenseAddView(WgerFormMixin, CreateView, WgerPermissionMixin):
'''
model = License
- success_url = reverse_lazy('core:license-list')
+ success_url = reverse_lazy('core:license:list')
title = ugettext_lazy('Add license')
- form_action = reverse_lazy('core:license-add')
+ form_action = reverse_lazy('core:license:add')
permission_required = 'core.add_license'
@@ -63,7 +63,7 @@ class LicenseUpdateView(WgerFormMixin, UpdateView, WgerPermissionMixin):
model = License
title = ugettext_lazy('Edit license')
- success_url = reverse_lazy('core:license-list')
+ success_url = reverse_lazy('core:license:list')
permission_required = 'core.change_license'
def get_context_data(self, **kwargs):
@@ -71,7 +71,7 @@ class LicenseUpdateView(WgerFormMixin, UpdateView, WgerPermissionMixin):
Send some additional data to the template
'''
context = super(LicenseUpdateView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('core:license-edit', kwargs={'pk': self.object.id})
+ context['form_action'] = reverse('core:license:edit', kwargs={'pk': self.object.id})
context['title'] = _(u'Edit {0}').format(self.object)
return context
@@ -82,7 +82,7 @@ class LicenseDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):
'''
model = License
- success_url = reverse_lazy('core:license-list')
+ success_url = reverse_lazy('core:license:list')
permission_required = 'core.delete_license'
def get_context_data(self, **kwargs):
@@ -91,5 +91,5 @@ class LicenseDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):
'''
context = super(LicenseDeleteView, self).get_context_data(**kwargs)
context['title'] = _(u'Delete {0}?').format(self.object)
- context['form_action'] = reverse('core:license-delete', kwargs={'pk': self.kwargs['pk']})
+ context['form_action'] = reverse('core:license:delete', kwargs={'pk': self.kwargs['pk']})
return context
diff --git a/wger/core/views/user.py b/wger/core/views/user.py
index ba8823a61..f27ca0452 100644
--- a/wger/core/views/user.py
+++ b/wger/core/views/user.py
@@ -80,7 +80,7 @@ def delete(request, user_pk=None):
if user_pk:
user = get_object_or_404(User, pk=user_pk)
- form_action = reverse('core:user-delete', kwargs={'user_pk': user_pk})
+ form_action = reverse('core:user:delete', kwargs={'user_pk': user_pk})
# Forbidden if the user has not enough rights, doesn't belong to the
# gym or is an admin as well
@@ -92,7 +92,7 @@ def delete(request, user_pk=None):
return HttpResponseForbidden()
else:
user = request.user
- form_action = reverse('core:user-delete')
+ form_action = reverse('core:user:delete')
form = PasswordConfirmationForm(user=request.user)
@@ -175,7 +175,7 @@ def logout(request):
django_logout(request)
if user.is_authenticated() and user.userprofile.is_temporary:
user.delete()
- return HttpResponseRedirect(reverse('core:login'))
+ return HttpResponseRedirect(reverse('core:user:login'))
def registration(request):
@@ -226,7 +226,7 @@ def registration(request):
template_data['form'] = form
template_data['title'] = _('Register')
template_data['form_fields'] = [i for i in form]
- template_data['form_action'] = reverse('core:registration')
+ template_data['form_action'] = reverse('core:user:registration')
template_data['submit_text'] = _('Register')
template_data['extend_template'] = 'base.html'
@@ -272,7 +272,7 @@ def preferences(request):
if redirect:
messages.success(request, _('Settings successfully updated'))
- return HttpResponseRedirect(reverse('core:preferences'))
+ return HttpResponseRedirect(reverse('core:user:preferences'))
else:
return render(request, 'user/preferences.html', template_data)
@@ -300,7 +300,7 @@ class UserDeactivateView(WgerPermissionMixin, RedirectView):
edit_user.is_active = False
edit_user.save()
messages.success(self.request, _('The user was successfully deactivated'))
- return reverse('core:user-overview', kwargs=({'pk': pk}))
+ return reverse('core:user:overview', kwargs=({'pk': pk}))
class UserActivateView(WgerPermissionMixin, RedirectView):
@@ -326,7 +326,7 @@ class UserActivateView(WgerPermissionMixin, RedirectView):
edit_user.is_active = True
edit_user.save()
messages.success(self.request, _('The user was successfully activated'))
- return reverse('core:user-overview', kwargs=({'pk': pk}))
+ return reverse('core:user:overview', kwargs=({'pk': pk}))
class UserEditView(WgerFormMixin, UpdateView):
@@ -350,14 +350,14 @@ class UserEditView(WgerFormMixin, UpdateView):
return HttpResponseForbidden()
def get_success_url(self):
- return reverse('core:user-overview', kwargs={'pk': self.kwargs['pk']})
+ return reverse('core:user:overview', kwargs={'pk': self.kwargs['pk']})
def get_context_data(self, **kwargs):
'''
Send some additional data to the template
'''
context = super(UserEditView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('core:user-edit', kwargs={'pk': self.object.id})
+ context['form_action'] = reverse('core:user:edit', kwargs={'pk': self.object.id})
context['title'] = _('Edit {0}'.format(self.object))
return context
@@ -382,7 +382,7 @@ def api_key(request):
token = Token.objects.create(user=request.user)
# Redirect to get rid of the GET parameter
- return HttpResponseRedirect(reverse('core:api-key'))
+ return HttpResponseRedirect(reverse('core:user:api-key'))
context['token'] = token
diff --git a/wger/gym/templates/admin_notes/list.html b/wger/gym/templates/admin_notes/list.html
index 76efe28c4..1abb5a5a0 100644
--- a/wger/gym/templates/admin_notes/list.html
+++ b/wger/gym/templates/admin_notes/list.html
@@ -12,7 +12,7 @@
{% breadcrumb "Gyms" "gym:gym:list" %}
{% endif %}
{% breadcrumb_raw member.userprofile.gym "gym:gym:user-list" member.userprofile.gym.pk %}
- {% breadcrumb_raw member|format_username "core:user-overview" member.pk %}
+ {% breadcrumb_raw member|format_username "core:user:overview" member.pk %}
{% breadcrumb "User notes" "gym:user_notes:list" member.pk %}
{% endblock %}
diff --git a/wger/gym/templates/document/list.html b/wger/gym/templates/document/list.html
index 7f4515866..93200aeb3 100644
--- a/wger/gym/templates/document/list.html
+++ b/wger/gym/templates/document/list.html
@@ -11,7 +11,7 @@
{% breadcrumb "Gyms" "gym:gym:list" %}
{% endif %}
{% breadcrumb_raw member.userprofile.gym "gym:gym:user-list" member.userprofile.gym.pk %}
- {% breadcrumb_raw member|format_username "core:user-overview" member.pk %}
+ {% breadcrumb_raw member|format_username "core:user:overview" member.pk %}
{% breadcrumb "Documents" "gym:document:list" member.pk %}
{% endblock %}
diff --git a/wger/gym/templates/gym/member_list.html b/wger/gym/templates/gym/member_list.html
index 57a5ceb75..8c30d2995 100644
--- a/wger/gym/templates/gym/member_list.html
+++ b/wger/gym/templates/gym/member_list.html
@@ -47,7 +47,7 @@ $(document).ready( function () {
{{current_user.obj.pk}}
</td>
<td>
- <a href="{% url 'core:user-overview' current_user.obj.pk %}">{{current_user.obj}}</a>
+ <a href="{% url 'core:user:overview' current_user.obj.pk %}">{{current_user.obj}}</a>
</td>
<td>
{{current_user.obj.get_full_name}}
diff --git a/wger/gym/tests/test_user.py b/wger/gym/tests/test_user.py
index a5fd91502..76fbd3732 100644
--- a/wger/gym/tests/test_user.py
+++ b/wger/gym/tests/test_user.py
@@ -147,7 +147,7 @@ class TrainerLoginTestCase(WorkoutManagerTestCase):
'''
Test the trainer login as an anonymous user
'''
- response = self.client.get(reverse('core:trainer-login', kwargs={'user_pk': 1}))
+ response = self.client.get(reverse('core:user:trainer-login', kwargs={'user_pk': 1}))
self.assertEqual(response.status_code, 302)
self.assertFalse(self.client.session.get('trainer.identity'))
@@ -156,7 +156,7 @@ class TrainerLoginTestCase(WorkoutManagerTestCase):
Test the trainer login as a logged in user without rights
'''
self.user_login('test')
- response = self.client.get(reverse('core:trainer-login', kwargs={'user_pk': 1}))
+ response = self.client.get(reverse('core:user:trainer-login', kwargs={'user_pk': 1}))
self.assertEqual(response.status_code, 403)
self.assertFalse(self.client.session.get('trainer.identity'))
@@ -165,7 +165,7 @@ class TrainerLoginTestCase(WorkoutManagerTestCase):
Test the trainer login as a logged in user with enough rights
'''
self.user_login('admin')
- response = self.client.get(reverse('core:trainer-login', kwargs={'user_pk': 2}))
+ response = self.client.get(reverse('core:user:trainer-login', kwargs={'user_pk': 2}))
self.assertEqual(response.status_code, 302)
self.assertTrue(self.client.session.get('trainer.identity'))
@@ -177,7 +177,7 @@ class TrainerLoginTestCase(WorkoutManagerTestCase):
profile.gym_id = 2
profile.save()
self.user_login('admin')
- response = self.client.get(reverse('core:trainer-login', kwargs={'user_pk': 2}))
+ response = self.client.get(reverse('core:user:trainer-login', kwargs={'user_pk': 2}))
self.assertEqual(response.status_code, 403)
self.assertFalse(self.client.session.get('trainer.identity'))
@@ -191,7 +191,7 @@ class TrainerLoginTestCase(WorkoutManagerTestCase):
user.user_permissions.add(permission)
self.user_login('admin')
- response = self.client.get(reverse('core:trainer-login', kwargs={'user_pk': 2}))
+ response = self.client.get(reverse('core:user:trainer-login', kwargs={'user_pk': 2}))
self.assertEqual(response.status_code, 403)
self.assertFalse(self.client.session.get('trainer.identity'))
@@ -205,7 +205,7 @@ class TrainerLoginTestCase(WorkoutManagerTestCase):
user.user_permissions.add(permission)
self.user_login('admin')
- response = self.client.get(reverse('core:trainer-login', kwargs={'user_pk': 2}))
+ response = self.client.get(reverse('core:user:trainer-login', kwargs={'user_pk': 2}))
self.assertEqual(response.status_code, 403)
self.assertFalse(self.client.session.get('trainer.identity'))
@@ -219,7 +219,7 @@ class TrainerLoginTestCase(WorkoutManagerTestCase):
user.user_permissions.add(permission)
self.user_login('admin')
- response = self.client.get(reverse('core:trainer-login', kwargs={'user_pk': 2}))
+ response = self.client.get(reverse('core:user:trainer-login', kwargs={'user_pk': 2}))
self.assertEqual(response.status_code, 403)
self.assertFalse(self.client.session.get('trainer.identity'))
@@ -234,8 +234,8 @@ class TrainerLogoutTestCase(WorkoutManagerTestCase):
Test the trainer login as an anonymous user
'''
self.user_login('admin')
- self.client.get(reverse('core:trainer-login', kwargs={'user_pk': 2}))
+ self.client.get(reverse('core:user:trainer-login', kwargs={'user_pk': 2}))
self.assertTrue(self.client.session.get('trainer.identity'))
- self.client.get(reverse('core:trainer-login', kwargs={'user_pk': 1}))
+ self.client.get(reverse('core:user:trainer-login', kwargs={'user_pk': 1}))
self.assertFalse(self.client.session.get('trainer.identity'))
diff --git a/wger/manager/templates/mobile/workout/view.html b/wger/manager/templates/mobile/workout/view.html
index f979566f6..4e74daaf1 100644
--- a/wger/manager/templates/mobile/workout/view.html
+++ b/wger/manager/templates/mobile/workout/view.html
@@ -60,7 +60,7 @@ $(document).ready(function() {
</a>
<a id="exercise-comments-toggle"
- href="{% url 'core:preferences' %}"
+ href="{% url 'core:user:preferences' %}"
{% auto_link_css flavour %}>
{% trans "Show/Hide exercise comments" %}
</a>
diff --git a/wger/manager/templates/workout/email_reminder.html b/wger/manager/templates/workout/email_reminder.html
index 38fd821fa..d7008db68 100644
--- a/wger/manager/templates/workout/email_reminder.html
+++ b/wger/manager/templates/workout/email_reminder.html
@@ -16,4 +16,4 @@ reminders, deactivate the option in your settings.{% endblocktrans %}
* http://{{site}}{{workout.get_absolute_url}}
* http://{{site}}{% url 'workout-add' %}
-* http://{{site}}{% url 'core:preferences' %}
\ No newline at end of file
+* http://{{site}}{% url 'core:user:preferences' %}
\ No newline at end of file
diff --git a/wger/manager/templates/workout/view.html b/wger/manager/templates/workout/view.html
index cd3db7f97..13409fd5b 100644
--- a/wger/manager/templates/workout/view.html
+++ b/wger/manager/templates/workout/view.html
@@ -56,7 +56,7 @@ $(document).ready(function() {
<p>
<a href="{% url 'day-add' workout.id %}" class="wger-modal-dialog">{% trans "Add training day" %}</a>
|
- <a id="exercise-comments-toggle" href="{% url 'core:preferences' %}">{% trans "Show/Hide exercise comments" %}</a>
+ <a id="exercise-comments-toggle" href="{% url 'core:user:preferences' %}">{% trans "Show/Hide exercise comments" %}</a>
</p>
{% endblock %}
diff --git a/wger/nutrition/templates/mobile/plan/view.html b/wger/nutrition/templates/mobile/plan/view.html
index aafb7870e..6214afa60 100644
--- a/wger/nutrition/templates/mobile/plan/view.html
+++ b/wger/nutrition/templates/mobile/plan/view.html
@@ -200,7 +200,7 @@ $(document).ready(function() {
{% if language.short_name != 'en' %}
<p>
{% trans "If you find the ingredient list too short, you might want to activate the preference to also show English ingredients." %}
- <a href="{% url 'core:preferences' %}" id="ajax-english-ingredients">{% trans "That's done here" %}</a>:
+ <a href="{% url 'core:user:preferences' %}" id="ajax-english-ingredients">{% trans "That's done here" %}</a>:
{% if user.userprofile.show_english_ingredients %}
<img src="{% static 'images/icons/status-on.svg' %}"
width="20"
diff --git a/wger/nutrition/templates/plan/view.html b/wger/nutrition/templates/plan/view.html
index ca8249545..f3ad09600 100644
--- a/wger/nutrition/templates/plan/view.html
+++ b/wger/nutrition/templates/plan/view.html
@@ -148,7 +148,7 @@ function custom_modal_init()
{% if language.short_name != 'en' %}
<p>
{% trans "If you find the ingredient list too short, you might want to activate the preference to also show English ingredients." %}
- <a href="{% url 'core:preferences' %}" id="ajax-english-ingredients">{% trans "That's done here" %}</a>.
+ <a href="{% url 'core:user:preferences' %}" id="ajax-english-ingredients">{% trans "That's done here" %}</a>.
</p>
{% endif %}
diff --git a/wger/software/templates/api.html b/wger/software/templates/api.html
index ac00a8216..8af7fb3ae 100644
--- a/wger/software/templates/api.html
+++ b/wger/software/templates/api.html
@@ -357,5 +357,5 @@ This is also new for us, if you plan on using the API,
</div>
<p><a href="/api/v2/" class="btn btn-block btn-default" rel="nofollow">Browse the API</a></p>
-<p><a href="{% url 'core:api-key' %}" class="btn btn-block btn-default">Generate API KEY</a></p>
+<p><a href="{% url 'core:user:api-key' %}" class="btn btn-block btn-default">Generate API KEY</a></p>
{% endblock %}
diff --git a/wger/utils/generic_views.py b/wger/utils/generic_views.py
index 5d9e68478..fda22a14f 100644
--- a/wger/utils/generic_views.py
+++ b/wger/utils/generic_views.py
@@ -63,7 +63,8 @@ class WgerPermissionMixin(object):
if self.login_required or self.permission_required:
if not request.user.is_authenticated():
- return HttpResponseRedirect(reverse_lazy('core:login') + '?next=%s' % request.path)
+ return HttpResponseRedirect(reverse_lazy('core:user:login')
+ + '?next={0}'.format(request.path))
if self.permission_required:
has_permission = False