Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Use nested namespaces for exercise URLs

Roland Geidera3cd62b2873d
diff --git a/wger/core/templates/mobile/navigation.html b/wger/core/templates/mobile/navigation.html
index 868b8eb90..cb78c5177 100644
--- a/wger/core/templates/mobile/navigation.html
+++ b/wger/core/templates/mobile/navigation.html
@@ -42,7 +42,7 @@
{# Exercises tab #}
{# #}
<li class="dropdown">
- <a href="{% url 'exercise-overview' %}"
+ <a href="{% url 'exercise:exercise:overview' %}"
class="dropdown-toggle"
data-toggle="dropdown">
{% if active_tab == 'exercises' %}<strong>{% endif %}
@@ -50,19 +50,19 @@
{% if active_tab == 'exercises' %}</strong>{% endif %}
</a>
<ul class="dropdown-menu">
- <li><a href="{% url 'exercise-overview' %}">{% trans "Exercises" %}</a></li>
- <li><a href="{% url 'muscle-overview' %}">{% trans "Muscle overview" %}</a></li>
- <li><a href="{% url 'equipment-overview' %}">{% trans "Equipment overview" %}</a></li>
+ <li><a href="{% url 'exercise:exercise:overview' %}">{% trans "Exercises" %}</a></li>
+ <li><a href="{% url 'exercise:muscle:overview' %}">{% trans "Muscle overview" %}</a></li>
+ <li><a href="{% url 'exercise:equipment:overview' %}">{% trans "Equipment overview" %}</a></li>
{% if user.is_authenticated and not user.userprofile.is_temporary %}
- <li><a href="{% url 'exercise-add' %}">{% trans "Add new exercise" %}</a><li>
+ <li><a href="{% url 'exercise:exercise:add' %}">{% trans "Add new exercise" %}</a><li>
{% endif %}
{% cache cache_timeout user-admin-exercises user.id language.id %}
{% if perms.exercises %}
<li class="divider"></li>
<li class="nav-header">{% trans "Administration" %}</li>
- <li><a href="{% url 'exercise-pending' %}">{% trans "Exercises pending review" %}</a></li>
- <li><a href="{% url 'equipment-list' %}">{% trans "Equipment" %}</a></li>
+ <li><a href="{% url 'exercise:exercise:pending' %}">{% trans "Exercises pending review" %}</a></li>
+ <li><a href="{% url 'exercise:equipment:list' %}">{% trans "Equipment" %}</a></li>
{% endif %}
{% endcache %}
</ul>
diff --git a/wger/core/templates/navigation.html b/wger/core/templates/navigation.html
index 9105ceb4b..1c455fb63 100644
--- a/wger/core/templates/navigation.html
+++ b/wger/core/templates/navigation.html
@@ -38,24 +38,24 @@
{# Exercises tab #}
{# #}
<li class="dropdown {% if active_tab == 'exercises' %}active{% endif %}">
- <a href="{% url 'exercise-overview' %}"
+ <a href="{% url 'exercise:exercise:overview' %}"
class="dropdown-toggle"
data-toggle="dropdown">{% trans "Exercises" %} <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="{% url 'exercise-overview' %}">{% trans "Exercises" %}</a></li>
- <li><a href="{% url 'muscle-overview' %}">{% trans "Muscle overview" %}</a></li>
- <li><a href="{% url 'equipment-overview' %}">{% trans "Equipment overview" %}</a></li>
+ <li><a href="{% url 'exercise:exercise:overview' %}">{% trans "Exercises" %}</a></li>
+ <li><a href="{% url 'exercise:muscle:overview' %}">{% trans "Muscle overview" %}</a></li>
+ <li><a href="{% url 'exercise:equipment:overview' %}">{% trans "Equipment overview" %}</a></li>
{% if user.is_authenticated and not user.userprofile.is_temporary and not trainer_identity %}
<li class="divider"></li>
- <li><a href="{% url 'exercise-add' %}">{% trans "Add new exercise" %}</a><li>
+ <li><a href="{% url 'exercise:exercise:add' %}">{% trans "Add new exercise" %}</a><li>
{% endif %}
{% cache cache_timeout user-admin-exercises user.id language.id %}
{% if perms.exercises %}
<li class="divider"></li>
<li class="nav-header">{% trans "Administration" %}</li>
- <li><a href="{% url 'exercise-pending' %}">{% trans "Exercises pending review" %}</a></li>
- <li><a href="{% url 'equipment-list' %}">{% trans "Equipment" %}</a></li>
+ <li><a href="{% url 'exercise:exercise:pending' %}">{% trans "Exercises pending review" %}</a></li>
+ <li><a href="{% url 'exercise:equipment:list' %}">{% trans "Equipment" %}</a></li>
{% endif %}
{% endcache %}
</ul>
diff --git a/wger/core/tests/test_temporary_users.py b/wger/core/tests/test_temporary_users.py
index f137997a6..e72b84aff 100644
--- a/wger/core/tests/test_temporary_users.py
+++ b/wger/core/tests/test_temporary_users.py
@@ -109,7 +109,7 @@ class DemoUserTestCase(WorkoutManagerTestCase):
self.client.get(reverse('software:code'))
self.assertEqual(self.count_temp_users(), 1)
- self.client.get(reverse('exercise-overview'))
+ self.client.get(reverse('exercise:exercise:overview'))
self.assertEqual(self.count_temp_users(), 1)
self.client.get(reverse('ingredient-list'))
@@ -146,9 +146,9 @@ class DemoUserTestCase(WorkoutManagerTestCase):
self.assertContains(self.client.get(reverse('core:dashboard')), demo_notice_text)
self.assertContains(self.client.get(reverse('workout-overview')),
demo_notice_text)
- self.assertContains(self.client.get(reverse('exercise-overview')),
+ self.assertContains(self.client.get(reverse('exercise:exercise:overview')),
demo_notice_text)
- self.assertContains(self.client.get(reverse('muscle-overview')), demo_notice_text)
+ self.assertContains(self.client.get(reverse('exercise:muscle:overview')), demo_notice_text)
self.assertContains(self.client.get(reverse('nutrition-overview')),
demo_notice_text)
self.assertContains(self.client.get(reverse('software:issues')), demo_notice_text)
diff --git a/wger/exercises/models.py b/wger/exercises/models.py
index 0c4bb028c..5faed513d 100644
--- a/wger/exercises/models.py
+++ b/wger/exercises/models.py
@@ -207,7 +207,7 @@ class Exercise(AbstractSubmissionModel, AbstractLicenseModel, models.Model):
'''
Returns the canonical URL to view an exercise
'''
- return reverse('exercise-view', kwargs={'id': self.id, 'slug': slugify(self.name)})
+ return reverse('exercise:exercise:view', kwargs={'id': self.id, 'slug': slugify(self.name)})
def save(self, *args, **kwargs):
'''
diff --git a/wger/exercises/templates/equipment/list.html b/wger/exercises/templates/equipment/list.html
index 86fbca1e4..4d7c60307 100644
--- a/wger/exercises/templates/equipment/list.html
+++ b/wger/exercises/templates/equipment/list.html
@@ -17,7 +17,7 @@
{% for equipment in equipment_list %}
<tr>
<td class="no-hover">
- <a href="{% url 'equipment-delete' equipment.id %}"
+ <a href="{% url 'exercise:equipment:delete' equipment.id %}"
class="wger-modal-dialog">
<img src="{% static 'images/icons/trash.svg' %}"
width="22"
@@ -25,7 +25,7 @@
alt="{% trans 'Delete' %}"
title="{% trans 'Delete' %}">
</a>
- <a href="{% url 'equipment-edit' equipment.id %}"
+ <a href="{% url 'exercise:equipment:edit' equipment.id %}"
class="wger-modal-dialog">
<img src="{% static 'images/icons/edit.svg' %}"
width="22"
@@ -55,7 +55,7 @@
{% if perms.exercises.add_equipment %}
<h3>{% trans "Options" %}</h3>
<p>
- <a href="{% url 'equipment-add' %}"
+ <a href="{% url 'exercise:equipment:add' %}"
{% auto_link_css flavour "wger-modal-dialog" %}>
<img src="{% static 'images/icons/new.svg' %}"
width="32"
diff --git a/wger/exercises/templates/equipment/overview.html b/wger/exercises/templates/equipment/overview.html
index be7238729..b48f8f4e7 100644
--- a/wger/exercises/templates/equipment/overview.html
+++ b/wger/exercises/templates/equipment/overview.html
@@ -100,7 +100,7 @@ $(function() {
<h3>{% trans "Add new exercise" %}</h3>
<p>
{% if user.is_authenticated and not user.userprofile.is_temporary %}
- <a href="{% url 'exercise-add' %}" {% auto_link_css flavour %}>
+ <a href="{% url 'exercise:exercise:add' %}" {% auto_link_css flavour %}>
<img src="{% static 'images/icons/new.svg' %}"
width="32"
height="32"
diff --git a/wger/exercises/templates/exercise/overview.html b/wger/exercises/templates/exercise/overview.html
index 8a0234808..55fd9fe92 100644
--- a/wger/exercises/templates/exercise/overview.html
+++ b/wger/exercises/templates/exercise/overview.html
@@ -121,7 +121,7 @@ $(document).ready(function() {
<h3>{% trans "Add new exercise" %}</h3>
<p>
{% if user.is_authenticated and not user.userprofile.is_temporary %}
- <a href="{% url 'exercise-add' %}" {% auto_link_css flavour %}>
+ <a href="{% url 'exercise:exercise:add' %}" {% auto_link_css flavour %}>
<img src="{% static 'images/icons/new.svg' %}"
width="32"
height="32"
@@ -147,7 +147,7 @@ $(document).ready(function() {
{% if exercises %}
{% with exercise=exercises|first %}
<p>
- <a href="{% url 'exercisecategory-edit' exercise.category.id %}"
+ <a href="{% url 'exercise:category:edit' exercise.category.id %}"
{% auto_link_css flavour "wger-modal-dialog" %}
id="current-category-edit">
<img src="{% static 'images/icons/edit.svg' %}"
@@ -161,7 +161,7 @@ $(document).ready(function() {
</p>
<p>
- <a href="{% url 'exercisecategory-delete' exercise.category.id %}"
+ <a href="{% url 'exercise:category:delete' exercise.category.id %}"
{% auto_link_css flavour "wger-modal-dialog" %}
id="current-category-delete">
<img src="{% static 'images/icons/trash.svg' %}"
@@ -177,7 +177,7 @@ $(document).ready(function() {
{% endif %}
<p>
- <a href="{% url 'exercisecategory-add' %}"
+ <a href="{% url 'exercise:category:add' %}"
{% auto_link_css flavour "wger-modal-dialog" %}>
<img src="{% static 'images/icons/folder-new.svg' %}"
width="32"
diff --git a/wger/exercises/templates/exercise/view.html b/wger/exercises/templates/exercise/view.html
index 3a456d308..c78e5ad45 100644
--- a/wger/exercises/templates/exercise/view.html
+++ b/wger/exercises/templates/exercise/view.html
@@ -30,7 +30,7 @@ included in the database.{% endblocktrans %}
{% if perms.exercises %}
<div class="row">
<div class="col-sm-6">
- <a href="{% url 'exercise-accept' exercise.id %}" class="btn btn-default btn-block">
+ <a href="{% url 'exercise:exercise:accept' exercise.id %}" class="btn btn-default btn-block">
<img src="{% static 'images/icons/status-on.svg' %}"
width="32"
height="32"
@@ -39,7 +39,7 @@ included in the database.{% endblocktrans %}
</a>
</div>
<div class="col-sm-6">
- <a href="{% url 'exercise-decline' exercise.id %}" class="btn btn-default btn-block">
+ <a href="{% url 'exercise:exercise:decline' exercise.id %}" class="btn btn-default btn-block">
<img src="{% static 'images/icons/status-off.svg' %}"
width="32"
height="32"
@@ -84,14 +84,14 @@ included in the database.{% endblocktrans %}
{{ comment }}
{% if perms.exercises %}
<span class="editoptions">
- <a href="{% url 'exercisecomment-delete' comment.id %}"
+ <a href="{% url 'exercise:comment:delete' comment.id %}"
title="{% trans 'Delete' %}">
<img src="{% static 'images/icons/trash.svg' %}"
width="16"
height="16"
alt="{% trans 'Delete' %}">
</a>
- <a href="{% url 'exercisecomment-edit' comment.id %}"
+ <a href="{% url 'exercise:comment:edit' comment.id %}"
title="{% trans 'Edit' %}"
class="wger-modal-dialog">
<img src="{% static 'images/icons/edit.svg' %}"
@@ -109,7 +109,7 @@ included in the database.{% endblocktrans %}
{% if perms.exercises %}
<p>
- <a href="{% url 'exercisecomment-add' exercise.id %}"
+ <a href="{% url 'exercise:comment:add' exercise.id %}"
title="{% trans 'Add' %}"
class="wger-modal-dialog">
<img src="{% static 'images/icons/add.svg' %}"
@@ -144,10 +144,10 @@ included in the database.{% endblocktrans %}
{% trans "Download" %}</a>
{% if perms.exercises.change_exerciseimage %}
|
- <a href="{% url 'exerciseimage-delete' exercise.pk image.pk %}"
+ <a href="{% url 'exercise:image:delete' exercise.pk image.pk %}"
class="wger-modal-dialog no-hover">
{% trans 'Delete' %}</a> |
- <a href="{% url 'exerciseimage-edit' image.pk %}"
+ <a href="{% url 'exercise:image:edit' image.pk %}"
class="no-hover">
{% trans 'Edit' %}</a>
{% endif %}
@@ -185,9 +185,9 @@ included in the database.{% endblocktrans %}
</div>
<div class="media-body">
<h4 class="media-heading">{{ image.image }}</h4>
- <a href="{% url 'exerciseimage-accept' image.pk %}" class="btn btn-default btn-sm">{% trans "Accept" %}</a>
- <a href="{% url 'exerciseimage-decline' image.pk %}" class="btn btn-default btn-sm">{% trans "Decline" %}</a>
- <a href="{% url 'exerciseimage-delete' exercise.pk image.pk %}" class="btn btn-danger btn-sm">{% trans "Delete" %}</a>
+ <a href="{% url 'exercise:image:accept' image.pk %}" class="btn btn-default btn-sm">{% trans "Accept" %}</a>
+ <a href="{% url 'exercise:image:decline' image.pk %}" class="btn btn-default btn-sm">{% trans "Decline" %}</a>
+ <a href="{% url 'exercise:image:delete' exercise.pk image.pk %}" class="btn btn-danger btn-sm">{% trans "Delete" %}</a>
</div>
</div>
</div>
@@ -200,7 +200,7 @@ included in the database.{% endblocktrans %}
{% if perms.exercises %}
<p>
- <a href="{% url 'exerciseimage-add' exercise.id %}"
+ <a href="{% url 'exercise:image:add' exercise.id %}"
title="{% trans 'Add' %}">
<img src="{% static 'images/icons/add.svg' %}"
width="16"
@@ -304,7 +304,7 @@ $(document).ready(function() {
<h3>{% trans "Back to overview" %}</h3>
<p>
- <a href="{% url 'exercise-overview' %}" {% auto_link_css flavour %}>
+ <a href="{% url 'exercise:exercise:overview' %}" {% auto_link_css flavour %}>
<img src="{% static 'images/icons/list.svg' %}"
width="32"
height="32"
@@ -318,7 +318,7 @@ $(document).ready(function() {
{% if perms.exercises %}
<h3>{% trans "Options" %}</h3>
<p>
- <a href="{% url 'exercise-edit' exercise.id %}" {% auto_link_css flavour %}>
+ <a href="{% url 'exercise:exercise:edit' exercise.id %}" {% auto_link_css flavour %}>
<img src="{% static 'images/icons/edit.svg' %}"
width="32"
height="32"
@@ -327,7 +327,7 @@ $(document).ready(function() {
</a>
</p>
<p>
- <a href="{% url 'exercise-delete' exercise.id %}"
+ <a href="{% url 'exercise:exercise:delete' exercise.id %}"
{% auto_link_css flavour "wger-modal-dialog" %}>
<img src="{% static 'images/icons/trash.svg' %}"
width="32"
diff --git a/wger/exercises/templates/mobile/exercise/overview.html b/wger/exercises/templates/mobile/exercise/overview.html
index 7a9f13a22..6fbab2331 100644
--- a/wger/exercises/templates/mobile/exercise/overview.html
+++ b/wger/exercises/templates/mobile/exercise/overview.html
@@ -114,7 +114,7 @@
<h3>{% trans "Add new exercise" %}</h3>
<p>
{% if user.is_authenticated and not user.userprofile.is_temporary %}
- <a href="{% url 'exercise-add' %}" {% auto_link_css flavour %}>
+ <a href="{% url 'exercise:exercise:add' %}" {% auto_link_css flavour %}>
<img src="{% static 'images/icons/new.svg' %}"
width="32"
height="32"
diff --git a/wger/exercises/templates/muscles/overview.html b/wger/exercises/templates/muscles/overview.html
index cadddaebe..41456240f 100644
--- a/wger/exercises/templates/muscles/overview.html
+++ b/wger/exercises/templates/muscles/overview.html
@@ -100,7 +100,7 @@ $(document).ready(function() {
<h3>{% trans "Options" %}</h3>
<p>
-<a href="{% url 'muscle-add' %}"
+<a href="{% url 'exercise:muscle:add' %}"
title="{% trans 'Add muscle' %}"
{% auto_link_css flavour "wger-modal-dialog" %}>
<img src="{% static 'images/icons/new.svg' %}"
@@ -119,7 +119,7 @@ folder <em>images/muscles</em>.{% endblocktrans %}</p>
<div id="muscle-edit-box" style="display:none;">
<p>
- <a href="{% url 'muscle-edit' 1 %}"
+ <a href="{% url 'exercise:muscle:edit' 1 %}"
{% auto_link_css flavour "wger-modal-dialog" %}
id="muscle-edit-edit-link">
<img src="{% static 'images/icons/edit.svg' %}"
@@ -129,7 +129,7 @@ folder <em>images/muscles</em>.{% endblocktrans %}</p>
title="{% trans 'Edit muscle' %}">{% trans 'Edit muscle' %}: <span class="muscle-edit-name"></span></a>
</p>
<p>
- <a href="{% url 'muscle-delete' 1 %}"
+ <a href="{% url 'exercise:muscle:delete' 1 %}"
{% auto_link_css flavour "wger-modal-dialog" %}
id="muscle-edit-delete-link">
<img src="{% static 'images/icons/trash.svg' %}"
diff --git a/wger/exercises/tests/test_categories.py b/wger/exercises/tests/test_categories.py
index 5b02f5f48..ed9e48617 100644
--- a/wger/exercises/tests/test_categories.py
+++ b/wger/exercises/tests/test_categories.py
@@ -31,7 +31,7 @@ class DeleteExerciseCategoryTestCase(WorkoutManagerDeleteTestCase):
'''
object_class = ExerciseCategory
- url = 'exercisecategory-delete'
+ url = 'exercise:category:delete'
pk = 4
user_success = 'admin'
user_fail = 'test'
@@ -43,7 +43,7 @@ class EditExerciseCategoryTestCase(WorkoutManagerEditTestCase):
'''
object_class = ExerciseCategory
- url = 'exercisecategory-edit'
+ url = 'exercise:category:edit'
pk = 3
data = {'name': 'A different name'}
@@ -54,7 +54,7 @@ class AddExerciseCategoryTestCase(WorkoutManagerAddTestCase):
'''
object_class = ExerciseCategory
- url = 'exercisecategory-add'
+ url = 'exercise:category:add'
data = {'name': 'A new category'}
@@ -69,8 +69,8 @@ class ExerciseCategoryCacheTestCase(WorkoutManagerTestCase):
performing certain operations
'''
- self.client.get(reverse('exercise-overview'))
- self.client.get(reverse('exercise-view', kwargs={'id': 2}))
+ self.client.get(reverse('exercise:exercise:overview'))
+ self.client.get(reverse('exercise:exercise:view', kwargs={'id': 2}))
old_exercise_overview = cache.get(get_template_cache_name('exercise-overview', 2))
old_exercise_overview_mobile = cache.get(get_template_cache_name('exercise-overview-mobile',
@@ -83,9 +83,9 @@ class ExerciseCategoryCacheTestCase(WorkoutManagerTestCase):
self.assertFalse(cache.get(get_template_cache_name('exercise-overview', 2)))
self.assertFalse(cache.get(get_template_cache_name('exercise-overview-mobile', 2)))
- self.client.get(reverse('exercise-overview'))
- self.client.get(reverse('muscle-overview'))
- self.client.get(reverse('exercise-view', kwargs={'id': 2}))
+ self.client.get(reverse('exercise:exercise:overview'))
+ self.client.get(reverse('exercise:muscle:overview'))
+ self.client.get(reverse('exercise:exercise:view', kwargs={'id': 2}))
new_exercise_overview = cache.get(get_template_cache_name('exercise-overview', 2))
new_exercise_overview_mobile = cache.get(get_template_cache_name('exercise-overview-mobile',
diff --git a/wger/exercises/tests/test_equipment.py b/wger/exercises/tests/test_equipment.py
index 4b3aa68f9..189be322b 100644
--- a/wger/exercises/tests/test_equipment.py
+++ b/wger/exercises/tests/test_equipment.py
@@ -35,7 +35,7 @@ class AddEquipmentTestCase(WorkoutManagerAddTestCase):
'''
object_class = Equipment
- url = 'equipment-add'
+ url = 'exercise:equipment:add'
data = {'name': 'A new equipment'}
@@ -45,7 +45,7 @@ class DeleteEquipmentTestCase(WorkoutManagerDeleteTestCase):
'''
object_class = Equipment
- url = 'equipment-delete'
+ url = 'exercise:equipment:delete'
pk = 1
@@ -55,7 +55,7 @@ class EditEquipmentTestCase(WorkoutManagerEditTestCase):
'''
object_class = Equipment
- url = 'equipment-edit'
+ url = 'exercise:equipment:edit'
pk = 1
data = {'name': 'A new name'}
@@ -71,31 +71,31 @@ class EquipmentListTestCase(WorkoutManagerTestCase):
self.user_login('admin')
data = {"name": "A new entry"}
for i in range(0, 50):
- self.client.post(reverse('equipment-add'), data)
+ self.client.post(reverse('exercise:equipment:add'), data)
# Page exists and the pagination works
- response = self.client.get(reverse('equipment-list'))
+ response = self.client.get(reverse('exercise:equipment:list'))
self.assertEqual(response.status_code, 200)
self.assertEqual(len(response.context['equipment_list']), PAGINATION_OBJECTS_PER_PAGE)
- response = self.client.get(reverse('equipment-list'), {'page': 2})
+ response = self.client.get(reverse('exercise:equipment:list'), {'page': 2})
self.assertEqual(response.status_code, 200)
self.assertEqual(len(response.context['equipment_list']), PAGINATION_OBJECTS_PER_PAGE)
- response = self.client.get(reverse('equipment-list'), {'page': 3})
+ response = self.client.get(reverse('exercise:equipment:list'), {'page': 3})
self.assertEqual(response.status_code, 200)
self.assertEqual(len(response.context['equipment_list']), 3)
# 'last' is a special case
- response = self.client.get(reverse('equipment-list'), {'page': 'last'})
+ response = self.client.get(reverse('exercise:equipment:list'), {'page': 'last'})
self.assertEqual(response.status_code, 200)
self.assertEqual(len(response.context['equipment_list']), 3)
# Page does not exist
- response = self.client.get(reverse('equipment-list'), {'page': 100})
+ response = self.client.get(reverse('exercise:equipment:list'), {'page': 100})
self.assertEqual(response.status_code, 404)
- response = self.client.get(reverse('equipment-list'), {'page': 'foobar'})
+ response = self.client.get(reverse('exercise:equipment:list'), {'page': 'foobar'})
self.assertEqual(response.status_code, 404)
@@ -109,10 +109,10 @@ class EquipmentCacheTestCase(WorkoutManagerTestCase):
Test the equipment overview cache is correctly generated on visit
'''
if self.is_mobile:
- self.client.get(reverse('equipment-overview'))
+ self.client.get(reverse('exercise:equipment:overview'))
else:
self.assertFalse(cache.get(get_template_cache_name('equipment-overview', 2)))
- self.client.get(reverse('equipment-overview'))
+ self.client.get(reverse('exercise:equipment:overview'))
self.assertTrue(cache.get(get_template_cache_name('equipment-overview', 2)))
def test_equipmet_cache_update(self):
@@ -123,8 +123,8 @@ class EquipmentCacheTestCase(WorkoutManagerTestCase):
self.assertFalse(cache.get(get_template_cache_name('equipment-overview', 2)))
- self.client.get(reverse('equipment-overview'))
- self.client.get(reverse('exercise-view', kwargs={'id': 2}))
+ self.client.get(reverse('exercise:equipment:overview'))
+ self.client.get(reverse('exercise:exercise:view', kwargs={'id': 2}))
old_exercise = cache.get(cache_mapper.get_exercise_key(2))
old_overview = cache.get(get_template_cache_name('equipment-overview', 2))
@@ -137,8 +137,8 @@ class EquipmentCacheTestCase(WorkoutManagerTestCase):
self.assertFalse(cache.get(get_template_cache_name('equipment-overview', 2)))
- self.client.get(reverse('equipment-overview'))
- self.client.get(reverse('exercise-view', kwargs={'id': 2}))
+ self.client.get(reverse('exercise:equipment:overview'))
+ self.client.get(reverse('exercise:exercise:view', kwargs={'id': 2}))
new_exercise = cache.get(cache_mapper.get_exercise_key(2))
new_overview = cache.get(get_template_cache_name('equipment-overview', 2))
diff --git a/wger/exercises/tests/test_exercise.py b/wger/exercises/tests/test_exercise.py
index 284708a79..a30b65f5c 100644
--- a/wger/exercises/tests/test_exercise.py
+++ b/wger/exercises/tests/test_exercise.py
@@ -36,7 +36,7 @@ class ExerciseIndexTestCase(WorkoutManagerTestCase):
Tests the exercise overview page
'''
- response = self.client.get(reverse('exercise-overview'))
+ response = self.client.get(reverse('exercise:exercise:overview'))
# Page exists
self.assertEqual(response.status_code, 200)
@@ -120,7 +120,7 @@ class ExerciseIndexTestCase(WorkoutManagerTestCase):
'''
self.user_login('admin')
ExerciseCategory.objects.all().delete()
- response = self.client.get(reverse('exercise-overview'))
+ response = self.client.get(reverse('exercise:exercise:overview'))
self.assertEqual(response.status_code, 200)
self.assertContains(response, 'No categories')
@@ -135,7 +135,7 @@ class ExerciseDetailTestCase(WorkoutManagerTestCase):
Tests the exercise details page
'''
- response = self.client.get(reverse('exercise-view', kwargs={'id': 1}))
+ response = self.client.get(reverse('exercise:exercise:view', kwargs={'id': 1}))
self.assertEqual(response.status_code, 200)
# Correct tab is selected
@@ -165,7 +165,7 @@ class ExerciseDetailTestCase(WorkoutManagerTestCase):
self.assertNotContains(response, 'Exercise is pending')
# Ensure that non-existent exercises throw a 404.
- response = self.client.get(reverse('exercise-view', kwargs={'id': 42}))
+ response = self.client.get(reverse('exercise:exercise:view', kwargs={'id': 42}))
self.assertEqual(response.status_code, 404)
def test_exercise_detail_editor(self):
@@ -204,7 +204,7 @@ class ExercisesTestCase(WorkoutManagerTestCase):
# Add an exercise
count_before = Exercise.objects.count()
- response = self.client.post(reverse('exercise-add'),
+ response = self.client.post(reverse('exercise:exercise:add'),
{'category': 2,
'name': 'my test exercise',
'license': 1,
@@ -240,7 +240,7 @@ class ExercisesTestCase(WorkoutManagerTestCase):
# Add an exercise
count_before = Exercise.objects.count()
description = 'a nice, long and accurate description for the exercise'
- response = self.client.post(reverse('exercise-add'),
+ response = self.client.post(reverse('exercise:exercise:add'),
{'category': 2,
'name': 'my test exercise',
'license': 1,
@@ -263,7 +263,7 @@ class ExercisesTestCase(WorkoutManagerTestCase):
self.assertEqual(exercise.license_author, 'test')
self.assertEqual(exercise.status, Exercise.STATUS_PENDING)
- response = self.client.get(reverse('exercise-view', kwargs={'id': exercise_id}))
+ response = self.client.get(reverse('exercise:exercise:view', kwargs={'id': exercise_id}))
self.assertEqual(response.status_code, 200)
# Navigation tab
@@ -273,7 +273,7 @@ class ExercisesTestCase(WorkoutManagerTestCase):
self.assertEqual(exercise_1.name, 'my test exercise')
# Wrong category - adding
- response = self.client.post(reverse('exercise-add'),
+ response = self.client.post(reverse('exercise:exercise:add'),
{'category': 111,
'name': 'my test exercise',
'license': 1,
@@ -281,7 +281,7 @@ class ExercisesTestCase(WorkoutManagerTestCase):
self.assertTrue(response.context['form'].errors['category'])
# Wrong category - editing
- response = self.client.post(reverse('exercise-edit', kwargs={'pk': '1'}),
+ response = self.client.post(reverse('exercise:exercise:edit', kwargs={'pk': '1'}),
{'category': 111,
'name': 'my test exercise',
'license': 1,
@@ -292,7 +292,7 @@ class ExercisesTestCase(WorkoutManagerTestCase):
self.assertIn(response.status_code, STATUS_CODES_FAIL)
# No muscles - adding
- response = self.client.post(reverse('exercise-add'),
+ response = self.client.post(reverse('exercise:exercise:add'),
{'category': 1,
'name': 'my test exercise',
'license': 1,
@@ -300,7 +300,7 @@ class ExercisesTestCase(WorkoutManagerTestCase):
self.assertFalse(response.context['form'].errors.get('muscles'))
# No muscles - editing
- response = self.client.post(reverse('exercise-edit', kwargs={'pk': '1'}),
+ response = self.client.post(reverse('exercise:exercise:edit', kwargs={'pk': '1'}),
{'category': 1,
'name': 'my test exercise',
'license': 1,
@@ -371,7 +371,7 @@ class DeleteExercisesTestCase(WorkoutManagerDeleteTestCase):
'''
object_class = Exercise
- url = 'exercise-delete'
+ url = 'exercise:exercise:delete'
pk = 2
user_success = 'admin'
user_fail = 'test'
@@ -388,11 +388,11 @@ class ExercisesCacheTestCase(WorkoutManagerTestCase):
'''
if self.is_mobile:
self.assertFalse(cache.get(get_template_cache_name('exercise-overview-mobile', 2)))
- self.client.get(reverse('exercise-overview'))
+ self.client.get(reverse('exercise:exercise:overview'))
self.assertTrue(cache.get(get_template_cache_name('exercise-overview-mobile', 2)))
else:
self.assertFalse(cache.get(get_template_cache_name('exercise-overview', 2)))
- self.client.get(reverse('exercise-overview'))
+ self.client.get(reverse('exercise:exercise:overview'))
self.assertTrue(cache.get(get_template_cache_name('exercise-overview', 2)))
def test_exercise_detail(self):
@@ -403,7 +403,7 @@ class ExercisesCacheTestCase(WorkoutManagerTestCase):
if not self.is_mobile:
self.assertFalse(cache.get(get_template_cache_name('exercise-detail-header', 2, 2)))
self.assertFalse(cache.get(get_template_cache_name('exercise-detail-muscles', 2, 2)))
- self.client.get(reverse('exercise-view', kwargs={'id': 2}))
+ self.client.get(reverse('exercise:exercise:view', kwargs={'id': 2}))
self.assertTrue(cache.get(get_template_cache_name('exercise-detail-header', 2, 2)))
self.assertTrue(cache.get(get_template_cache_name('exercise-detail-muscles', 2, 2)))
@@ -421,8 +421,8 @@ class ExercisesCacheTestCase(WorkoutManagerTestCase):
self.assertFalse(cache.get(get_template_cache_name('exercise-detail-header', 2, 2)))
self.assertFalse(cache.get(get_template_cache_name('exercise-detail-muscles', 2, 2)))
- self.client.get(reverse('exercise-overview'))
- self.client.get(reverse('exercise-view', kwargs={'id': 2}))
+ self.client.get(reverse('exercise:exercise:overview'))
+ self.client.get(reverse('exercise:exercise:view', kwargs={'id': 2}))
old_exercise = cache.get(cache_mapper.get_exercise_key(2))
old_exercise_bg = cache.get(cache_mapper.get_exercise_muscle_bg_key(2))
@@ -447,9 +447,9 @@ class ExercisesCacheTestCase(WorkoutManagerTestCase):
self.assertFalse(cache.get(get_template_cache_name('exercise-detail-header', 2, 2)))
self.assertFalse(cache.get(get_template_cache_name('exercise-detail-muscles', 2, 2)))
- self.client.get(reverse('exercise-overview'))
- self.client.get(reverse('muscle-overview'))
- self.client.get(reverse('exercise-view', kwargs={'id': 2}))
+ self.client.get(reverse('exercise:exercise:overview'))
+ self.client.get(reverse('exercise:muscle:overview'))
+ self.client.get(reverse('exercise:exercise:view', kwargs={'id': 2}))
new_exercise = cache.get(cache_mapper.get_exercise_key(2))
new_exercise_bg = cache.get(cache_mapper.get_exercise_muscle_bg_key(2))
diff --git a/wger/exercises/tests/test_exercise_comments.py b/wger/exercises/tests/test_exercise_comments.py
index 2a0924603..c3560363c 100644
--- a/wger/exercises/tests/test_exercise_comments.py
+++ b/wger/exercises/tests/test_exercise_comments.py
@@ -32,7 +32,7 @@ class AddExerciseCommentTestCase(WorkoutManagerAddTestCase):
'''
object_class = ExerciseComment
- url = reverse('exercisecomment-add', kwargs={'exercise_pk': 1})
+ url = reverse('exercise:comment:add', kwargs={'exercise_pk': 1})
user_fail = False
data = {'comment': 'a new cool comment'}
@@ -43,7 +43,7 @@ class EditExerciseCommentTestCase(WorkoutManagerEditTestCase):
'''
object_class = ExerciseComment
- url = 'exercisecomment-edit'
+ url = 'exercise:comment:edit'
pk = 1
data = {'comment': 'an edited comment'}
@@ -66,7 +66,7 @@ class ExercisecommentsTestCase(WorkoutManagerTestCase):
self.assertEqual(len(comments), 1)
# Delete the comment
- response = self.client.post(reverse('exercisecomment-delete', kwargs={'id': 1}))
+ response = self.client.post(reverse('exercise:comment:delete', kwargs={'id': 1}))
comments = exercise_1.exercisecomment_set.all()
self.assertEqual(response.status_code, 302)
diff --git a/wger/exercises/tests/test_exercise_images.py b/wger/exercises/tests/test_exercise_images.py
index 5496679a2..de8ad75a7 100644
--- a/wger/exercises/tests/test_exercise_images.py
+++ b/wger/exercises/tests/test_exercise_images.py
@@ -115,7 +115,7 @@ class AddExerciseImageTestCase(WorkoutManagerAddTestCase):
'''
object_class = ExerciseImage
- url = reverse('exerciseimage-add', kwargs={'exercise_pk': 1})
+ url = reverse('exercise:image:add', kwargs={'exercise_pk': 1})
user_fail = False
data = {'is_main': True,
'image': open('wger/exercises/tests/protestschwein.jpg', 'rb'),
@@ -128,7 +128,7 @@ class EditExerciseImageTestCase(WorkoutManagerEditTestCase):
'''
object_class = ExerciseImage
- url = 'exerciseimage-edit'
+ url = 'exercise:image:edit'
pk = 2
data = {'is_main': True,
'license': 1}
@@ -140,7 +140,7 @@ class DeleteExerciseImageTestCase(WorkoutManagerDeleteTestCase):
'''
object_class = ExerciseImage
- url = reverse('exerciseimage-delete', kwargs={'exercise_pk': 1, 'pk': 1})
+ url = reverse('exercise:image:delete', kwargs={'exercise_pk': 1, 'pk': 1})
pk = 1
diff --git a/wger/exercises/tests/test_muscles.py b/wger/exercises/tests/test_muscles.py
index d8b2fb144..3fd336523 100644
--- a/wger/exercises/tests/test_muscles.py
+++ b/wger/exercises/tests/test_muscles.py
@@ -32,7 +32,7 @@ class AddMuscleTestCase(WorkoutManagerAddTestCase):
'''
object_class = Muscle
- url = 'muscle-add'
+ url = 'exercise:muscle:add'
data = {'name': 'A new muscle',
'is_front': True}
@@ -43,7 +43,7 @@ class EditMuscleTestCase(WorkoutManagerEditTestCase):
'''
object_class = Muscle
- url = 'muscle-edit'
+ url = 'exercise:muscle:edit'
pk = 1
data = {'name': 'The new name',
'is_front': True}
@@ -55,7 +55,7 @@ class DeleteMuscleTestCase(WorkoutManagerDeleteTestCase):
'''
object_class = Muscle
- url = 'muscle-delete'
+ url = 'exercise:muscle:delete'
pk = 1
@@ -71,7 +71,7 @@ class MuscleCacheTestCase(WorkoutManagerTestCase):
if not self.is_mobile:
self.assertFalse(cache.get(get_template_cache_name('muscle-overview', 2)))
- self.client.get(reverse('muscle-overview'))
+ self.client.get(reverse('exercise:muscle:overview'))
self.assertTrue(cache.get(get_template_cache_name('muscle-overview', 2)))
@@ -86,14 +86,14 @@ class MuscleOverviewTestCase(WorkoutManagerTestCase):
'''
self.user_login('admin')
- response = self.client.get(reverse('muscle-overview'))
+ response = self.client.get(reverse('exercise:muscle:overview'))
self.assertContains(response, 'Edit muscle')
self.assertContains(response, 'Delete muscle')
self.assertContains(response, 'Add muscle')
self.assertContains(response, 'After adding a muscle')
self.user_logout()
- response = self.client.get(reverse('muscle-overview'))
+ response = self.client.get(reverse('exercise:muscle:overview'))
self.assertNotContains(response, 'Edit muscle')
self.assertNotContains(response, 'Delete muscle')
self.assertNotContains(response, 'Add muscle')
diff --git a/wger/exercises/tests/test_submitted_exercise.py b/wger/exercises/tests/test_submitted_exercise.py
index 107cef547..15d1d4932 100644
--- a/wger/exercises/tests/test_submitted_exercise.py
+++ b/wger/exercises/tests/test_submitted_exercise.py
@@ -30,7 +30,7 @@ class ExercisesPendingTestCase(WorkoutManagerTestCase):
'''
Helper function
'''
- response = self.client.get(reverse('exercise-pending'))
+ response = self.client.get(reverse('exercise:exercise:pending'))
if not fail:
self.assertEqual(response.status_code, 200)
self.assertEqual(len(response.context['exercise_list']), 1)
@@ -70,7 +70,7 @@ class ExercisesPendingDetailTestCase(WorkoutManagerTestCase):
'''
Helper function
'''
- response = self.client.get(reverse('exercise-view', kwargs={'id': 4}))
+ response = self.client.get(reverse('exercise:exercise:view', kwargs={'id': 4}))
self.assertContains(response, 'Exercise is pending')
if not fail:
@@ -118,7 +118,7 @@ class ExerciseAcceptTestCase(WorkoutManagerTestCase):
'''
exercise = Exercise.objects.get(pk=4)
self.assertEqual(exercise.status, Exercise.STATUS_PENDING)
- response = self.client.get(reverse('exercise-accept', kwargs={'pk': 4}))
+ response = self.client.get(reverse('exercise:exercise:accept', kwargs={'pk': 4}))
exercise = Exercise.objects.get(pk=4)
self.assertEqual(response.status_code, 302)
@@ -167,7 +167,7 @@ class ExerciseRejectTestCase(WorkoutManagerTestCase):
'''
exercise = Exercise.objects.get(pk=4)
self.assertEqual(exercise.status, Exercise.STATUS_PENDING)
- response = self.client.get(reverse('exercise-decline', kwargs={'pk': 4}))
+ response = self.client.get(reverse('exercise:exercise:decline', kwargs={'pk': 4}))
exercise = Exercise.objects.get(pk=4)
self.assertEqual(response.status_code, 302)
diff --git a/wger/exercises/tests/test_submitted_image.py b/wger/exercises/tests/test_submitted_image.py
index b75640b43..88977a45f 100644
--- a/wger/exercises/tests/test_submitted_image.py
+++ b/wger/exercises/tests/test_submitted_image.py
@@ -30,7 +30,7 @@ class ImagePendingDetailTestCase(WorkoutManagerTestCase):
'''
Helper function
'''
- response = self.client.get(reverse('exercise-view', kwargs={'id': 2}))
+ response = self.client.get(reverse('exercise:exercise:view', kwargs={'id': 2}))
self.assertEqual(response.status_code, 200)
if not fail:
@@ -77,7 +77,7 @@ class ImageAcceptTestCase(WorkoutManagerTestCase):
'''
image = ExerciseImage.objects.get(pk=3)
self.assertEqual(image.status, ExerciseImage.STATUS_PENDING)
- response = self.client.get(reverse('exerciseimage-accept', kwargs={'pk': 3}))
+ response = self.client.get(reverse('exercise:image:accept', kwargs={'pk': 3}))
image = ExerciseImage.objects.get(pk=3)
self.assertEqual(response.status_code, 302)
@@ -125,7 +125,7 @@ class ImageRejectTestCase(WorkoutManagerTestCase):
'''
image = ExerciseImage.objects.get(pk=3)
self.assertEqual(image.status, ExerciseImage.STATUS_PENDING)
- response = self.client.get(reverse('exerciseimage-decline', kwargs={'pk': 3}))
+ response = self.client.get(reverse('exercise:image:decline', kwargs={'pk': 3}))
image = ExerciseImage.objects.get(pk=3)
self.assertEqual(response.status_code, 302)
diff --git a/wger/exercises/urls.py b/wger/exercises/urls.py
index 4bd63638d..4fef8f9d6 100644
--- a/wger/exercises/urls.py
+++ b/wger/exercises/urls.py
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.
-from django.conf.urls import patterns, url
+from django.conf.urls import patterns, url, include
from django.contrib.auth.decorators import login_required
from wger.exercises.views import exercises
@@ -25,106 +25,126 @@ from wger.exercises.views import muscles
from wger.exercises.views import images
from wger.exercises.views import equipment
-urlpatterns = patterns('wger.exercises.views',
- # Exercises
- url(r'^overview/$',
- exercises.ExerciseListView.as_view(),
- name='exercise-overview'),
- url(r'^(?P<id>\d+)/view/$',
- exercises.view,
- name='exercise-view'),
- url(r'^(?P<id>\d+)/view/(?P<slug>[-\w]*)/?$',
- exercises.view,
- name='exercise-view'),
+# sub patterns for muscles
+patterns_muscle = patterns('',
+ url(r'^overview/$',
+ muscles.MuscleListView.as_view(),
+ name='overview'),
url(r'^add/$',
- login_required(exercises.ExerciseAddView.as_view()),
- name='exercise-add'),
+ muscles.MuscleAddView.as_view(),
+ name='add'),
url(r'^(?P<pk>\d+)/edit/$',
- exercises.ExerciseUpdateView.as_view(),
- name='exercise-edit'),
+ muscles.MuscleUpdateView.as_view(),
+ name='edit'),
url(r'^(?P<pk>\d+)/delete/$',
- exercises.ExerciseDeleteView.as_view(),
- name='exercise-delete'),
- url(r'^pending/$',
- exercises.PendingExerciseListView.as_view(),
- name='exercise-pending'),
+ muscles.MuscleDeleteView.as_view(),
+ name='delete'),
+)
+
+# sub patterns for exercise images
+patterns_images = patterns('',
+ url(r'^(?P<exercise_pk>\d+)/image/add$',
+ images.ExerciseImageAddView.as_view(),
+ name='add'),
+ url(r'^(?P<pk>\d+)/edit$',
+ images.ExerciseImageEditView.as_view(),
+ name='edit'),
+ url(r'^(?P<exercise_pk>\d+)/image/(?P<pk>\d+)/delete$',
+ images.ExerciseImageDeleteView.as_view(),
+ name='delete'),
url(r'^(?P<pk>\d+)/accept/$',
- exercises.accept,
- name='exercise-accept'),
+ images.accept,
+ name='accept'),
url(r'^(?P<pk>\d+)/decline/$',
- exercises.decline,
- name='exercise-decline'),
-
- # Muscles
- url(r'^muscle/overview/$',
- muscles.MuscleListView.as_view(),
- name='muscle-overview'),
- url(r'^muscle/add/$',
- muscles.MuscleAddView.as_view(),
- name='muscle-add'),
- url(r'^muscle/(?P<pk>\d+)/edit/$',
- muscles.MuscleUpdateView.as_view(),
- name='muscle-edit'),
- url(r'^muscle/(?P<pk>\d+)/delete/$',
- muscles.MuscleDeleteView.as_view(),
- name='muscle-delete'),
+ images.decline,
+ name='decline'),
+)
- # Comments
+# sub patterns for exercise comments
+patterns_comment = patterns('',
url(r'^(?P<exercise_pk>\d+)/comment/add/$',
comments.ExerciseCommentAddView.as_view(),
- name='exercisecomment-add'),
- url(r'^comment/(?P<pk>\d+)/edit/$',
+ name='add'),
+ url(r'^(?P<pk>\d+)/edit/$',
comments.ExerciseCommentEditView.as_view(),
- name='exercisecomment-edit'),
- url(r'^comment/(?P<id>\d+)/delete/$',
- 'comments.delete',
- name='exercisecomment-delete'),
+ name='edit'),
+ url(r'^(?P<id>\d+)/delete/$',
+ comments.delete,
+ name='delete'),
+)
- # Categories
- url(r'^category/(?P<pk>\d+)/edit/$',
+# sub patterns for categories
+patterns_category = patterns('',
+ url(r'^(?P<pk>\d+)/edit/$',
categories.ExerciseCategoryUpdateView.as_view(),
- name='exercisecategory-edit'),
- url(r'^category/add/$',
+ name='edit'),
+ url(r'^add/$',
categories.ExerciseCategoryAddView.as_view(),
- name='exercisecategory-add'),
- url(r'^category/(?P<pk>\d+)/delete/$',
+ name='add'),
+ url(r'^(?P<pk>\d+)/delete/$',
categories.ExerciseCategoryDeleteView.as_view(),
- name='exercisecategory-delete'),
-
- # Images
- url(r'^(?P<exercise_pk>\d+)/image/add$',
- images.ExerciseImageAddView.as_view(),
- name='exerciseimage-add'),
- url(r'^image/(?P<pk>\d+)/edit$',
- images.ExerciseImageEditView.as_view(),
- name='exerciseimage-edit'),
- url(r'^(?P<exercise_pk>\d+)/image/(?P<pk>\d+)/delete$',
- images.ExerciseImageDeleteView.as_view(),
- name='exerciseimage-delete'),
- url(r'^image/(?P<pk>\d+)/accept/$',
- images.accept,
- name='exerciseimage-accept'),
- url(r'^image/(?P<pk>\d+)/decline/$',
- images.decline,
- name='exerciseimage-decline'),
+ name='delete'),
+)
- # Equipment
- url(r'^equipment/list$',
+# sub patterns for equipment
+patterns_equipment = patterns('',
+ url(r'^list$',
equipment.EquipmentListView.as_view(),
- name='equipment-list'),
- url(r'^equipment/add$',
+ name='list'),
+ url(r'^add$',
equipment.EquipmentAddView.as_view(),
- name='equipment-add'),
- url(r'^equipment/(?P<pk>\d+)/edit$',
+ name='add'),
+ url(r'^(?P<pk>\d+)/edit$',
equipment.EquipmentEditView.as_view(),
- name='equipment-edit'),
- url(r'^equipment/(?P<pk>\d+)/delete$',
+ name='edit'),
+ url(r'^(?P<pk>\d+)/delete$',
equipment.EquipmentDeleteView.as_view(),
- name='equipment-delete'),
- url(r'^equipment/overview$',
+ name='delete'),
+ url(r'^overview$',
equipment.EquipmentOverviewView.as_view(),
- name='equipment-overview'),
+ name='overview'),
+)
+
+
+# sub patterns for exercises
+patterns_exercise = patterns('',
+ url(r'^overview/$',
+ exercises.ExerciseListView.as_view(),
+ name='overview'),
+ url(r'^(?P<id>\d+)/view/$',
+ exercises.view,
+ name='view'),
+ url(r'^(?P<id>\d+)/view/(?P<slug>[-\w]*)/?$',
+ exercises.view,
+ name='view'),
+ url(r'^add/$',
+ login_required(exercises.ExerciseAddView.as_view()),
+ name='add'),
+ url(r'^(?P<pk>\d+)/edit/$',
+ exercises.ExerciseUpdateView.as_view(),
+ name='edit'),
+ url(r'^(?P<pk>\d+)/delete/$',
+ exercises.ExerciseDeleteView.as_view(),
+ name='delete'),
+ url(r'^pending/$',
+ exercises.PendingExerciseListView.as_view(),
+ name='pending'),
+ url(r'^(?P<pk>\d+)/accept/$',
+ exercises.accept,
+ name='accept'),
+ url(r'^(?P<pk>\d+)/decline/$',
+ exercises.decline,
+ name='decline'),
+)
+
+urlpatterns = patterns('',
+ url(r'^muscle/', include(patterns_muscle, namespace="muscle")),
+ url(r'^image/', include(patterns_images, namespace="image")),
+ url(r'^comment/', include(patterns_comment, namespace="comment")),
+ url(r'^category/', include(patterns_category, namespace="category")),
+ url(r'^equipment/', include(patterns_equipment, namespace="equipment")),
+ url(r'^', include(patterns_exercise, namespace="exercise")),
)
diff --git a/wger/exercises/views/categories.py b/wger/exercises/views/categories.py
index 06be02de2..91fd43c38 100644
--- a/wger/exercises/views/categories.py
+++ b/wger/exercises/views/categories.py
@@ -46,9 +46,9 @@ class ExerciseCategoryAddView(WgerFormMixin, CreateView, WgerPermissionMixin):
'''
model = ExerciseCategory
- success_url = reverse_lazy('exercise-overview')
+ success_url = reverse_lazy('exercise:exercise:overview')
title = ugettext_lazy('Add category')
- form_action = reverse_lazy('exercisecategory-add')
+ form_action = reverse_lazy('exercise:category:add')
messages = ugettext_lazy('Category was successfully created')
permission_required = 'exercises.add_exercisecategory'
@@ -63,14 +63,14 @@ class ExerciseCategoryUpdateView(WgerFormMixin, UpdateView, WgerPermissionMixin)
'''
model = ExerciseCategory
- success_url = reverse_lazy('exercise-overview')
+ success_url = reverse_lazy('exercise:exercise:overview')
messages = ugettext_lazy('Category successfully edited')
permission_required = 'exercises.change_exercisecategory'
# Send some additional data to the template
def get_context_data(self, **kwargs):
context = super(ExerciseCategoryUpdateView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('exercisecategory-edit', kwargs={'pk': self.object.id})
+ context['form_action'] = reverse('exercise:category:edit', kwargs={'pk': self.object.id})
context['title'] = _(u'Edit {0}').format(self.object.name)
return context
@@ -87,7 +87,7 @@ class ExerciseCategoryDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixi
'''
model = ExerciseCategory
- success_url = reverse_lazy('exercise-overview')
+ success_url = reverse_lazy('exercise:exercise:overview')
delete_message = ugettext_lazy('This will also delete all exercises in this category.')
messages = ugettext_lazy('Category successfully deleted')
permission_required = 'exercises.delete_exercisecategory'
@@ -97,6 +97,6 @@ class ExerciseCategoryDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixi
context = super(ExerciseCategoryDeleteView, self).get_context_data(**kwargs)
context['title'] = _(u'Delete {0}?').format(self.object.name)
- context['form_action'] = reverse('exercisecategory-delete', kwargs={'pk': self.object.id})
+ context['form_action'] = reverse('exercise:category:delete', kwargs={'pk': self.object.id})
return context
diff --git a/wger/exercises/views/comments.py b/wger/exercises/views/comments.py
index 0614de9f0..6986096f4 100644
--- a/wger/exercises/views/comments.py
+++ b/wger/exercises/views/comments.py
@@ -51,12 +51,12 @@ class ExerciseCommentEditView(WgerFormMixin, UpdateView, WgerPermissionMixin):
permission_required = 'exercises.change_exercisecomment'
def get_success_url(self):
- return reverse('exercise-view', kwargs={'id': self.object.exercise.id})
+ return reverse('exercise:exercise:view', kwargs={'id': self.object.exercise.id})
# Send some additional data to the template
def get_context_data(self, **kwargs):
context = super(ExerciseCommentEditView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('exercisecomment-edit',
+ context['form_action'] = reverse('exercise:comment:edit',
kwargs={'pk': self.object.id})
return context
@@ -76,14 +76,14 @@ class ExerciseCommentAddView(WgerFormMixin, CreateView, WgerPermissionMixin):
return super(ExerciseCommentAddView, self).form_valid(form)
def get_success_url(self):
- return reverse('exercise-view', kwargs={'id': self.object.exercise.id})
+ return reverse('exercise:exercise:view', kwargs={'id': self.object.exercise.id})
def get_context_data(self, **kwargs):
'''
Send some additional data to the template
'''
context = super(ExerciseCommentAddView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('exercisecomment-add',
+ context['form_action'] = reverse('exercise:comment:add',
kwargs={'exercise_pk': self.kwargs['exercise_pk']})
return context
@@ -96,4 +96,4 @@ def delete(request, id):
exercise_id = comment.exercise.id
comment.delete()
- return HttpResponseRedirect(reverse('exercise-view', kwargs={'id': exercise_id}))
+ return HttpResponseRedirect(reverse('exercise:exercise:view', kwargs={'id': exercise_id}))
diff --git a/wger/exercises/views/equipment.py b/wger/exercises/views/equipment.py
index 2d7040372..cb3e0b57c 100644
--- a/wger/exercises/views/equipment.py
+++ b/wger/exercises/views/equipment.py
@@ -62,12 +62,12 @@ class EquipmentEditView(WgerFormMixin, UpdateView, WgerPermissionMixin):
model = Equipment
title = ugettext_lazy('Edit equipment')
permission_required = 'exercises.change_equipment'
- success_url = reverse_lazy('equipment-list')
+ success_url = reverse_lazy('exercise:equipment:list')
# Send some additional data to the template
def get_context_data(self, **kwargs):
context = super(EquipmentEditView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('equipment-edit',
+ context['form_action'] = reverse('exercise:equipment:edit',
kwargs={'pk': self.object.id})
return context
@@ -81,14 +81,14 @@ class EquipmentAddView(WgerFormMixin, CreateView, WgerPermissionMixin):
model = Equipment
title = ugettext_lazy('Add equipment')
permission_required = 'exercises.add_equipment'
- success_url = reverse_lazy('equipment-list')
+ success_url = reverse_lazy('exercise:equipment:list')
def get_context_data(self, **kwargs):
'''
Send some additional data to the template
'''
context = super(EquipmentAddView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('equipment-add')
+ context['form_action'] = reverse('exercise:equipment:add')
return context
@@ -101,7 +101,7 @@ class EquipmentDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):
model = Equipment
messages = ugettext_lazy('Successfully deleted')
permission_required = 'exercises.delete_equipment'
- success_url = reverse_lazy('equipment-list')
+ success_url = reverse_lazy('exercise:equipment:list')
def get_context_data(self, **kwargs):
'''
@@ -111,7 +111,7 @@ class EquipmentDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):
context = super(EquipmentDeleteView, self).get_context_data(**kwargs)
context['title'] = _('Delete equipment?')
- context['form_action'] = reverse('equipment-delete',
+ context['form_action'] = reverse('exercise:equipment:delete',
kwargs={'pk': pk})
return context
diff --git a/wger/exercises/views/exercises.py b/wger/exercises/views/exercises.py
index 69ea1ff28..b0feec6d5 100644
--- a/wger/exercises/views/exercises.py
+++ b/wger/exercises/views/exercises.py
@@ -190,7 +190,7 @@ class ExerciseUpdateView(ExercisesEditAddView, UpdateView, WgerPermissionMixin):
def get_context_data(self, **kwargs):
context = super(ExerciseUpdateView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('exercise-edit', kwargs={'pk': self.object.id})
+ context['form_action'] = reverse('exercise:exercise:edit', kwargs={'pk': self.object.id})
context['title'] = _(u'Edit {0}').format(self.object.name)
return context
@@ -202,7 +202,7 @@ class ExerciseAddView(ExercisesEditAddView, CreateView, WgerPermissionMixin):
'''
login_required = True
- form_action = reverse_lazy('exercise-add')
+ form_action = reverse_lazy('exercise:exercise:add')
def form_valid(self, form):
'''
@@ -228,7 +228,7 @@ class ExerciseDeleteView(WgerDeleteMixin, DeleteView):
'''
model = Exercise
- success_url = reverse_lazy('exercise-overview')
+ success_url = reverse_lazy('exercise:exercise:overview')
delete_message = ugettext_lazy('This will delete the exercise from all workouts.')
messages = ugettext_lazy('Exercise successfully deleted')
permission_required = 'exercises.delete_exercise'
@@ -239,7 +239,8 @@ class ExerciseDeleteView(WgerDeleteMixin, DeleteView):
'''
context = super(ExerciseDeleteView, self).get_context_data(**kwargs)
context['title'] = _(u'Delete {0}?').format(self.object.name)
- context['form_action'] = reverse('exercise-delete', kwargs={'pk': self.kwargs['pk']})
+ context['form_action'] = reverse('exercise:exercise:delete',
+ kwargs={'pk': self.kwargs['pk']})
return context
diff --git a/wger/exercises/views/images.py b/wger/exercises/views/images.py
index a21de36d5..f8e2eb198 100644
--- a/wger/exercises/views/images.py
+++ b/wger/exercises/views/images.py
@@ -53,13 +53,13 @@ class ExerciseImageEditView(WgerFormMixin, UpdateView, WgerPermissionMixin):
form_class = ExerciseImageForm
def get_success_url(self):
- return reverse('exercise-view', kwargs={'id': self.object.exercise.id})
+ return reverse('exercise:exercise:view', kwargs={'id': self.object.exercise.id})
# Send some additional data to the template
def get_context_data(self, **kwargs):
context = super(ExerciseImageEditView, self).get_context_data(**kwargs)
context['enctype'] = 'multipart/form-data'
- context['form_action'] = reverse('exerciseimage-edit',
+ context['form_action'] = reverse('exercise:image:edit',
kwargs={'pk': self.object.id})
return context
@@ -81,7 +81,7 @@ class ExerciseImageAddView(WgerFormMixin, CreateView, WgerPermissionMixin):
return super(ExerciseImageAddView, self).form_valid(form)
def get_success_url(self):
- return reverse('exercise-view', kwargs={'id': self.object.exercise.id})
+ return reverse('exercise:exercise:view', kwargs={'id': self.object.exercise.id})
def get_context_data(self, **kwargs):
'''
@@ -89,7 +89,7 @@ class ExerciseImageAddView(WgerFormMixin, CreateView, WgerPermissionMixin):
'''
context = super(ExerciseImageAddView, self).get_context_data(**kwargs)
context['enctype'] = 'multipart/form-data'
- context['form_action'] = reverse('exerciseimage-add',
+ context['form_action'] = reverse('exercise:image:add',
kwargs={'exercise_pk': self.kwargs['exercise_pk']})
return context
@@ -108,7 +108,7 @@ class ExerciseImageDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):
'''
Return to exercise image
'''
- return reverse('exercise-view', kwargs={'id': self.kwargs['exercise_pk']})
+ return reverse('exercise:exercise:view', kwargs={'id': self.kwargs['exercise_pk']})
def get_context_data(self, **kwargs):
'''
@@ -119,7 +119,7 @@ class ExerciseImageDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):
context = super(ExerciseImageDeleteView, self).get_context_data(**kwargs)
context['title'] = _('Delete exercise image?')
- context['form_action'] = reverse('exerciseimage-delete',
+ context['form_action'] = reverse('exercise:image:delete',
kwargs={'pk': pk, 'exercise_pk': exercise_pk})
return context
diff --git a/wger/exercises/views/muscles.py b/wger/exercises/views/muscles.py
index 422522b3f..1e118141a 100644
--- a/wger/exercises/views/muscles.py
+++ b/wger/exercises/views/muscles.py
@@ -60,9 +60,9 @@ class MuscleAddView(WgerFormMixin, CreateView, WgerPermissionMixin):
'''
model = Muscle
- success_url = reverse_lazy('muscle-overview')
+ success_url = reverse_lazy('exercise:muscle:overview')
title = ugettext_lazy('Add muscle')
- form_action = reverse_lazy('muscle-add')
+ form_action = reverse_lazy('exercise:muscle:add')
permission_required = 'exercises.add_muscle'
@@ -73,7 +73,7 @@ class MuscleUpdateView(WgerFormMixin, UpdateView, WgerPermissionMixin):
model = Muscle
title = ugettext_lazy('Edit muscle')
- success_url = reverse_lazy('muscle-overview')
+ success_url = reverse_lazy('exercise:muscle:overview')
permission_required = 'exercises.change_muscle'
def get_context_data(self, **kwargs):
@@ -81,7 +81,7 @@ class MuscleUpdateView(WgerFormMixin, UpdateView, WgerPermissionMixin):
Send some additional data to the template
'''
context = super(MuscleUpdateView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('muscle-edit', kwargs={'pk': self.object.id})
+ context['form_action'] = reverse('exercise:muscle:edit', kwargs={'pk': self.object.id})
context['title'] = _(u'Edit {0}').format(self.object.name)
return context
@@ -92,7 +92,7 @@ class MuscleDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):
'''
model = Muscle
- success_url = reverse_lazy('muscle-overview')
+ success_url = reverse_lazy('exercise:muscle:overview')
permission_required = 'exercises.delete_muscle'
def get_context_data(self, **kwargs):
@@ -101,5 +101,5 @@ class MuscleDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):
'''
context = super(MuscleDeleteView, self).get_context_data(**kwargs)
context['title'] = _(u'Delete {0}?').format(self.object.name)
- context['form_action'] = reverse('muscle-delete', kwargs={'pk': self.kwargs['pk']})
+ context['form_action'] = reverse('exercise:muscle:delete', kwargs={'pk': self.kwargs['pk']})
return context
diff --git a/wger/software/templates/contribute.html b/wger/software/templates/contribute.html
index ea00457bc..19fd1e233 100644
--- a/wger/software/templates/contribute.html
+++ b/wger/software/templates/contribute.html
@@ -59,7 +59,7 @@ like much, but is incredibly important!{% endblocktrans %}</p>
love and do every week but are not in the list yet. If you think some description
is too short or some other detail is missing or could be improved, tell!{% endblocktrans %}</p>
{% if user.is_authenticated and not user.userprofile.is_temporary %}
- <a class="btn btn-default" href="{% url 'exercise-add' %}">{% trans "Add exercise" %} »</a>
+ <a class="btn btn-default" href="{% url 'exercise:exercise:add' %}">{% trans "Add exercise" %} »</a>
{% else %}
<a class="btn disabled btn-default" href="#">{% trans "Only registered users can do this" %} »</a>
{% endif %}
diff --git a/wger/urls.py b/wger/urls.py
index 4808d58bf..39fe1b5b7 100644
--- a/wger/urls.py
+++ b/wger/urls.py
@@ -133,7 +133,7 @@ urlpatterns = i18n_patterns('',
url(r'^admin/', include(admin.site.urls)),
url(r'^', include('wger.core.urls', namespace='core', app_name='core')),
url(r'^', include('wger.manager.urls')),
- url(r'exercise/', include('wger.exercises.urls')),
+ url(r'exercise/', include('wger.exercises.urls', namespace='exercise')),
url(r'weight/', include('wger.weight.urls')),
url(r'nutrition/', include('wger.nutrition.urls')),
url(r'software/', include('wger.software.urls', namespace='software', app_name='software')),
diff --git a/wger/utils/tests/test_middleware.py b/wger/utils/tests/test_middleware.py
index 2cfd9899a..3e394040e 100644
--- a/wger/utils/tests/test_middleware.py
+++ b/wger/utils/tests/test_middleware.py
@@ -73,11 +73,11 @@ class RobotsExclusionMiddlewareTestCase(WorkoutManagerTestCase):
Test the middleware on URLs from exercises app
'''
- response = self.client.get(reverse('exercise-overview'))
+ response = self.client.get(reverse('exercise:exercise:overview'))
self.assertFalse(response.get('X-Robots-Tag'))
- response = self.client.get(reverse('exercise-view', kwargs={'id': 1}))
+ response = self.client.get(reverse('exercise:exercise:view', kwargs={'id': 1}))
self.assertFalse(response.get('X-Robots-Tag'))
- response = self.client.get(reverse('muscle-overview'))
+ response = self.client.get(reverse('exercise:muscle:overview'))
self.assertFalse(response.get('X-Robots-Tag'))