Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Use nested namespaces for nutrition URLs

Roland Geider5952366a680d
diff --git a/wger/core/templates/index.html b/wger/core/templates/index.html
index 40f4f7e60..355240fc0 100644
--- a/wger/core/templates/index.html
+++ b/wger/core/templates/index.html
@@ -97,7 +97,7 @@ day in your current workout:{% endblocktrans %} <strong>{{current_workout}}</str
{% if plan %}
<p>
- <a href="{% url 'nutrition-view' plan.id %}">
+ <a href="{% url 'nutrition:plan:view' plan.id %}">
{% if plan.description %}
{{ plan.description }}
{% else %}
@@ -123,7 +123,7 @@ day in your current workout:{% endblocktrans %} <strong>{{current_workout}}</str
{% else %}
<p>
- <a href="{% url 'nutrition-add' %}" class="btn btn-block btn-default">
+ <a href="{% url 'nutrition:plan:add' %}" class="btn btn-block btn-default">
{% trans "No nutrition plans." %} {% trans "Add one now." %}
</a>
</p>
@@ -150,7 +150,7 @@ day in your current workout:{% endblocktrans %} <strong>{{current_workout}}</str
</div>
<div class="col-sm-6">
<p>
- <a href="{% url 'nutrition-add' %}">
+ <a href="{% url 'nutrition:plan:add' %}">
<img src="{% static 'images/icons/new.svg' %}"
width="32"
height="32"
diff --git a/wger/core/templates/mobile/index.html b/wger/core/templates/mobile/index.html
index 9e241fbe1..72ae20555 100644
--- a/wger/core/templates/mobile/index.html
+++ b/wger/core/templates/mobile/index.html
@@ -49,7 +49,7 @@
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title">{% trans "Current nutrition plan" %}</h4>
{% if plan %}
- <h5><a href="{% url 'nutrition-view' plan.id %}">{{ plan }}</a></h5>
+ <h5><a href="{% url 'nutrition:plan:view' plan.id %}">{{ plan }}</a></h5>
{% endif %}
</div>
<div class="modal-body">
@@ -207,7 +207,7 @@ its default duration in your settings.{% endblocktrans %}
{{plan}}
</a>
{% else %}
- <a href="{% url 'nutrition-add' %}" class="btn btn-default btn-block">
+ <a href="{% url 'nutrition:plan:add' %}" class="btn btn-default btn-block">
<img src="{% static 'images/icons/add.svg' %}"
width="32"
height="32"
diff --git a/wger/core/templates/mobile/navigation.html b/wger/core/templates/mobile/navigation.html
index cb78c5177..2b45beca1 100644
--- a/wger/core/templates/mobile/navigation.html
+++ b/wger/core/templates/mobile/navigation.html
@@ -93,7 +93,7 @@
{# Nutrition tab #}
{# #}
<li class="dropdown">
- <a href="{% url 'nutrition-overview' %}"
+ <a href="{% url 'nutrition:plan:overview' %}"
class="dropdown-toggle"
data-toggle="dropdown"
rel="nofollow">
@@ -102,16 +102,16 @@
{% if active_tab == 'nutrition' %}</strong>{% endif %}
</a>
<ul class="dropdown-menu">
- <li><a href="{% url 'nutrition-overview' %}" rel="nofollow">{% trans "Nutrition plans" %}</a></li>
- <li><a href="{% url 'ingredient-list' %}">{% trans "Ingredient overview" %}</a></li>
- <li><a href="{% url 'bmi-view' %}" rel="nofollow">{% trans "BMI calculator" %}</a></li>
- <li><a href="{% url 'calories-calculator' %}" rel="nofollow">{% trans "Daily calories calculator" %}</a></li>
+ <li><a href="{% url 'nutrition:plan:overview' %}" rel="nofollow">{% trans "Nutrition plans" %}</a></li>
+ <li><a href="{% url 'nutrition:ingredient:list' %}">{% trans "Ingredient overview" %}</a></li>
+ <li><a href="{% url 'nutrition:bmi:view' %}" rel="nofollow">{% trans "BMI calculator" %}</a></li>
+ <li><a href="{% url 'nutrition:calories:view' %}" rel="nofollow">{% trans "Daily calories calculator" %}</a></li>
{% cache cache_timeout user-admin-ingredients user.id language.id %}
{% if perms.exercises %}
<li class="divider"></li>
<li class="nav-header">{% trans "Administration" %}</li>
- <li><a href="{% url 'weight-unit-list' %}">{% trans "Ingredient weight units" %}</a></li>
- <li><a href="{% url 'ingredient-pending' %}">{% trans "Ingredients pending review" %}</a></li>
+ <li><a href="{% url 'nutrition:weight_unit:list' %}">{% trans "Ingredient weight units" %}</a></li>
+ <li><a href="{% url 'nutrition:ingredient:pending' %}">{% trans "Ingredients pending review" %}</a></li>
{% endif %}
{% endcache %}
</ul>
diff --git a/wger/core/templates/mobile/template.html b/wger/core/templates/mobile/template.html
index 23144f31f..a760f24b6 100644
--- a/wger/core/templates/mobile/template.html
+++ b/wger/core/templates/mobile/template.html
@@ -157,7 +157,7 @@
<a href="{% url 'workout-overview' %}" {% auto_link_css flavour %}>{% trans "Workouts" %}</a>
</div>
<div class="btn-group">
- <a href="{% url 'nutrition-overview' %}" {% auto_link_css flavour %}>{% trans "Nutrition" %}</a>
+ <a href="{% url 'nutrition:plan:overview' %}" {% auto_link_css flavour %}>{% trans "Nutrition" %}</a>
</div>
{% else %}
<div class="btn-group">
diff --git a/wger/core/templates/navigation.html b/wger/core/templates/navigation.html
index 1c455fb63..c55119d33 100644
--- a/wger/core/templates/navigation.html
+++ b/wger/core/templates/navigation.html
@@ -82,21 +82,21 @@
{# Nutrition tab #}
{# #}
<li class="dropdown {% if active_tab == 'nutrition' %}active{% endif %}">
- <a href="{% url 'nutrition-overview' %}"
+ <a href="{% url 'nutrition:plan:overview' %}"
class="dropdown-toggle"
data-toggle="dropdown"
rel="nofollow">{% trans "Nutrition" %} <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="{% url 'nutrition-overview' %}" rel="nofollow">{% trans "Nutrition plans" %}</a></li>
- <li><a href="{% url 'ingredient-list' %}">{% trans "Ingredient overview" %}</a></li>
- <li><a href="{% url 'bmi-view' %}" rel="nofollow">{% trans "BMI calculator" %}</a></li>
- <li><a href="{% url 'calories-calculator' %}" rel="nofollow">{% trans "Daily calories calculator" %}</a></li>
+ <li><a href="{% url 'nutrition:plan:overview' %}" rel="nofollow">{% trans "Nutrition plans" %}</a></li>
+ <li><a href="{% url 'nutrition:ingredient:list' %}">{% trans "Ingredient overview" %}</a></li>
+ <li><a href="{% url 'nutrition:bmi:view' %}" rel="nofollow">{% trans "BMI calculator" %}</a></li>
+ <li><a href="{% url 'nutrition:calories:view' %}" rel="nofollow">{% trans "Daily calories calculator" %}</a></li>
{% cache cache_timeout user-admin-ingredients user.id language.id %}
{% if perms.exercises %}
<li class="divider"></li>
<li class="nav-header">{% trans "Administration" %}</li>
- <li><a href="{% url 'weight-unit-list' %}">{% trans "Ingredient weight units" %}</a></li>
- <li><a href="{% url 'ingredient-pending' %}">{% trans "Ingredients pending review" %}</a></li>
+ <li><a href="{% url 'nutrition:weight_unit:list' %}">{% trans "Ingredient weight units" %}</a></li>
+ <li><a href="{% url 'nutrition:ingredient:pending' %}">{% trans "Ingredients pending review" %}</a></li>
{% endif %}
{% endcache %}
</ul>
diff --git a/wger/core/templates/user/overview.html b/wger/core/templates/user/overview.html
index 70f5ba17f..9818a04e9 100644
--- a/wger/core/templates/user/overview.html
+++ b/wger/core/templates/user/overview.html
@@ -149,7 +149,7 @@
{{nutrition_plan.creation_date}}
</td>
<td>
- <a href="{{trainer_login}}?next={% url 'nutrition-view' nutrition_plan.id %}">{{nutrition_plan.description}}</a>
+ <a href="{{trainer_login}}?next={% url 'nutrition:plan:view' nutrition_plan.id %}">{{nutrition_plan.description}}</a>
</td>
<td>
{{nutrition_plan.get_nutritional_values.total.energy|floatformat}}kcal
diff --git a/wger/core/tests/test_index.py b/wger/core/tests/test_index.py
index 556247203..4b8ce28bb 100644
--- a/wger/core/tests/test_index.py
+++ b/wger/core/tests/test_index.py
@@ -65,7 +65,7 @@ class DashboardTestCase(WorkoutManagerTestCase):
#
# 2. Add a nutrition plan
#
- self.client.get(reverse('nutrition-add'))
+ self.client.get(reverse('nutrition:plan:add'))
response = self.client.get(reverse('core:dashboard'))
self.assertEqual(response.status_code, 200)
diff --git a/wger/core/tests/test_temporary_users.py b/wger/core/tests/test_temporary_users.py
index e72b84aff..ebbb3f203 100644
--- a/wger/core/tests/test_temporary_users.py
+++ b/wger/core/tests/test_temporary_users.py
@@ -112,7 +112,7 @@ class DemoUserTestCase(WorkoutManagerTestCase):
self.client.get(reverse('exercise:exercise:overview'))
self.assertEqual(self.count_temp_users(), 1)
- self.client.get(reverse('ingredient-list'))
+ self.client.get(reverse('nutrition:ingredient:list'))
self.assertEqual(self.count_temp_users(), 1)
# These pages will create one
@@ -134,7 +134,7 @@ class DemoUserTestCase(WorkoutManagerTestCase):
self.assertEqual(self.count_temp_users(), 4)
self.user_logout()
- self.client.get(reverse('nutrition-overview'))
+ self.client.get(reverse('nutrition:plan:overview'))
self.assertEqual(self.count_temp_users(), 5)
def test_demo_user_notice(self):
@@ -149,7 +149,7 @@ class DemoUserTestCase(WorkoutManagerTestCase):
self.assertContains(self.client.get(reverse('exercise:exercise:overview')),
demo_notice_text)
self.assertContains(self.client.get(reverse('exercise:muscle:overview')), demo_notice_text)
- self.assertContains(self.client.get(reverse('nutrition-overview')),
+ self.assertContains(self.client.get(reverse('nutrition:plan:overview')),
demo_notice_text)
self.assertContains(self.client.get(reverse('software:issues')), demo_notice_text)
self.assertContains(self.client.get(reverse('software:license')), demo_notice_text)
diff --git a/wger/nutrition/models.py b/wger/nutrition/models.py
index b731a853a..339bc8043 100644
--- a/wger/nutrition/models.py
+++ b/wger/nutrition/models.py
@@ -96,7 +96,7 @@ class NutritionPlan(models.Model):
'''
Returns the canonical URL to view this object
'''
- return reverse('nutrition-view', kwargs={'id': self.id})
+ return reverse('nutrition:plan:view', kwargs={'id': self.id})
def get_nutritional_values(self):
'''
@@ -311,7 +311,8 @@ class Ingredient(AbstractLicenseModel, models.Model):
'''
Returns the canonical URL to view this object
'''
- return reverse('ingredient-view', kwargs={'id': self.id, 'slug': slugify(self.name)})
+ return reverse('nutrition:ingredient:view',
+ kwargs={'id': self.id, 'slug': slugify(self.name)})
def clean(self):
'''
diff --git a/wger/nutrition/templates/bmi/form.html b/wger/nutrition/templates/bmi/form.html
index 4c47c854e..fd76425c2 100644
--- a/wger/nutrition/templates/bmi/form.html
+++ b/wger/nutrition/templates/bmi/form.html
@@ -55,7 +55,7 @@ $(document).ready(function () {
-->
{% block content %}
-<form action="{% url 'bmi-calculate' %}"
+<form action="{% url 'nutrition:bmi:calculate' %}"
method="post"
class="form-horizontal"
id="bmi-form">
diff --git a/wger/nutrition/templates/ingredient/overview.html b/wger/nutrition/templates/ingredient/overview.html
index 3cb93d9eb..e90f753ae 100644
--- a/wger/nutrition/templates/ingredient/overview.html
+++ b/wger/nutrition/templates/ingredient/overview.html
@@ -42,7 +42,7 @@ $(document).ready(function() {
</div>
{% else %}
<p>
- <a href="{% url 'ingredient-add' %}" class="btn btn-default btn-block">
+ <a href="{% url 'nutrition:ingredient:add' %}" class="btn btn-default btn-block">
{% trans "No ingredients." %} {% trans "Add one now." %}
</a>
</p>
@@ -57,7 +57,7 @@ $(document).ready(function() {
{% if user.is_authenticated and not user.userprofile.is_temporary %}
<h3>{% trans "Add ingredient" %}</h3>
<p>
- <a href="{% url 'ingredient-add' %}" {% auto_link_css flavour %}>
+ <a href="{% url 'nutrition:ingredient:add' %}" {% auto_link_css flavour %}>
<img src="{% static 'images/icons/new.svg' %}"
width="32"
height="32"
diff --git a/wger/nutrition/templates/ingredient/view.html b/wger/nutrition/templates/ingredient/view.html
index 360869cd4..e1ed0035d 100644
--- a/wger/nutrition/templates/ingredient/view.html
+++ b/wger/nutrition/templates/ingredient/view.html
@@ -29,7 +29,7 @@ the search.{% endblocktrans %}
{% if perms.exercises %}
<div class="row">
<div class="col-sm-6">
- <a href="{% url 'ingredient-accept' ingredient.id %}" class="btn btn-default btn-block">
+ <a href="{% url 'nutrition:ingredient:accept' ingredient.id %}" class="btn btn-default btn-block">
<img src="{% static 'images/icons/status-on.svg' %}"
width="32"
height="32"
@@ -38,7 +38,7 @@ the search.{% endblocktrans %}
</a>
</div>
<div class="col-sm-6">
- <a href="{% url 'ingredient-decline' ingredient.id %}" class="btn btn-default btn-block">
+ <a href="{% url 'nutrition:ingredient:decline' ingredient.id %}" class="btn btn-default btn-block">
<img src="{% static 'images/icons/status-off.svg' %}"
width="32"
height="32"
@@ -190,7 +190,7 @@ the search.{% endblocktrans %}
<h3>{% trans "Options" %}</h3>
<p>
-<a href="{% url 'ingredient-delete' ingredient.id %}"
+<a href="{% url 'nutrition:ingredient:delete' ingredient.id %}"
title="{% trans 'Delete ingredient' %}"
{% auto_link_css flavour "wger-modal-dialog" %}>
<img src="{% static 'images/icons/trash.svg' %}"
@@ -203,7 +203,7 @@ the search.{% endblocktrans %}
</p>
<p>
-<a href="{% url 'ingredient-edit' ingredient.id %}"
+<a href="{% url 'nutrition:ingredient:edit' ingredient.id %}"
title="{% trans 'Edit ingredient' %}"
{% auto_link_css flavour %}>
<img src="{% static 'images/icons/edit.svg' %}"
@@ -217,7 +217,7 @@ the search.{% endblocktrans %}
<h3>{% trans "Weight units" %}</h3>
<p>
-<a href="{% url 'weight-unit-ingredient-add' ingredient.id %}"
+<a href="{% url 'nutrition:unit_ingredient:add' ingredient.id %}"
{% auto_link_css flavour "wger-modal-dialog" %}>
<img src="{% static 'images/icons/new.svg' %}"
width="32"
@@ -240,7 +240,7 @@ the search.{% endblocktrans %}
<td>
{{unit.amount}} {{unit.unit.name}} = {{unit.gram}}g
<span class="editoptions float-right">
- <a href="{% url 'weight-unit-ingredient-edit' unit.id %}"
+ <a href="{% url 'nutrition:weight_unit:edit' unit.id %}"
title="{% trans 'Edit' %}"
{% auto_link_css flavour "wger-modal-dialog" %}>
<img src="{% static 'images/icons/edit.svg' %}"
@@ -249,7 +249,7 @@ the search.{% endblocktrans %}
alt="{% trans 'Edit' %}"
title="{% trans 'Edit' %}">
</a>
- <a href="{% url 'weight-unit-ingredient-delete' unit.id %}"
+ <a href="{% url 'nutrition:weight_unit:delete' unit.id %}"
title="{% trans 'Delete' %}"
{% auto_link_css flavour "wger-modal-dialog" %}>
<img src="{% static 'images/icons/trash.svg' %}"
diff --git a/wger/nutrition/templates/mobile/ingredient_overview.html b/wger/nutrition/templates/mobile/ingredient_overview.html
index 18d1c905b..9161cfbbe 100644
--- a/wger/nutrition/templates/mobile/ingredient_overview.html
+++ b/wger/nutrition/templates/mobile/ingredient_overview.html
@@ -33,7 +33,7 @@
{% if perms.exercises %}
<h3>{% trans "Options" %}</h3>
<p>
- <a href="{% url 'ingredient-add' %}">
+ <a href="{% url 'nutrition:ingredient:add' %}">
<img src="{% static 'images/icons/new.svg' %}"
width="32"
height="32"
diff --git a/wger/nutrition/templates/mobile/plan/overview.html b/wger/nutrition/templates/mobile/plan/overview.html
index 77e06e68c..3f9de6b7d 100644
--- a/wger/nutrition/templates/mobile/plan/overview.html
+++ b/wger/nutrition/templates/mobile/plan/overview.html
@@ -7,7 +7,7 @@
{% block content %}
<div class="list-group">
{% for plan in plans %}
- <a href="{% url 'nutrition-view' plan.id %}" class="list-group-item wger-list-group-item">
+ <a href="{% url 'nutrition:plan:view' plan.id %}" class="list-group-item wger-list-group-item">
<span class="glyphicon glyphicon-chevron-right pull-right"></span>
<h3 class="list-group-item-heading">{{plan}}</h3>
@@ -17,7 +17,7 @@
</p>
</a>
{% empty %}
- <a href="{% url 'nutrition-add' %}" class="list-group-item wger-list-group-item">
+ <a href="{% url 'nutrition:plan:add' %}" class="list-group-item wger-list-group-item">
{% trans "No nutrition plans." %}<br>
{% trans "Add one now." %}
</a>
@@ -30,7 +30,7 @@
{% block sidebar%}
<h3>{% trans "Options" %}</h3>
<p>
- <a href="{% url 'nutrition-add' %}" {% auto_link_css flavour %}>
+ <a href="{% url 'nutrition:plan:add' %}" {% auto_link_css flavour %}>
<img src="{% static 'images/icons/new.svg' %}"
width="32"
height="32"
@@ -40,7 +40,7 @@
</p>
<p>
- <a href="{% url 'ingredient-list' %}" {% auto_link_css flavour %}>
+ <a href="{% url 'nutrition:ingredient:list' %}" {% auto_link_css flavour %}>
<img src="{% static 'images/icons/list.svg' %}"
width="32"
height="32"
diff --git a/wger/nutrition/templates/mobile/plan/view.html b/wger/nutrition/templates/mobile/plan/view.html
index 95e15856f..aafb7870e 100644
--- a/wger/nutrition/templates/mobile/plan/view.html
+++ b/wger/nutrition/templates/mobile/plan/view.html
@@ -41,7 +41,7 @@ $(document).ready(function() {
</h4>
</div>
<div class="modal-body">
- <a href="{% url 'wger.nutrition.views.meal.delete_meal' meal.id %}"
+ <a href="{% url 'nutrition:meal:delete' meal.id %}"
title="{% trans 'Delete' %}"
{% auto_link_css flavour %}>
<img src="{% static 'images/icons/trash.svg' %}"
@@ -51,7 +51,7 @@ $(document).ready(function() {
title="{% trans 'Delete meal' %}">
{% trans "Delete meal" %}
</a>
- <a href="{% url 'meal-edit' meal.id %}"
+ <a href="{% url 'nutrition:meal:edit' meal.id %}"
title="{% trans 'Edit' %}"
{% auto_link_css flavour "wger-modal-dialog" %}>
<img src="{% static 'images/icons/edit.svg' %}"
@@ -61,7 +61,7 @@ $(document).ready(function() {
title="{% trans 'Edit meal' %}">
{% trans "Edit meal" %}
</a>
- <a href="{% url 'mealitem-add' meal.id %}"
+ <a href="{% url 'nutrition:meal_item:add' meal.id %}"
title="{% trans 'Add' %}"
{% auto_link_css flavour %}>
<img src="{% static 'images/icons/add.svg' %}"
@@ -119,7 +119,7 @@ $(document).ready(function() {
</tbody>
</table>
- <a href="{% url 'wger.nutrition.views.meal_item.delete_meal_item' item.id %}"
+ <a href="{% url 'nutrition:meal_item:delete' item.id %}"
title="{% trans 'Delete' %}"
{% auto_link_css flavour %}>
<img src="{% static 'images/icons/trash.svg' %}"
@@ -128,7 +128,7 @@ $(document).ready(function() {
alt="{% trans 'Delete' %}">
{% trans "Delete" %}
</a>
- <a href="{% url 'mealitem-edit' item.id %}"
+ <a href="{% url 'nutrition:meal_item:edit' item.id %}"
title="{% trans 'Edit' %}"
{% auto_link_css flavour %}>
<img src="{% static 'images/icons/edit.svg' %}"
@@ -168,14 +168,14 @@ $(document).ready(function() {
</p>
</a>
{% if forloop.last %}
- <a href="{% url 'mealitem-add' meal.id %}"
+ <a href="{% url 'nutrition:meal_item:add' meal.id %}"
class="list-group-item list-group-item-success">
<span class="glyphicon glyphicon-plus"></span>
{% trans "Add item to meal" %}
</a>
{% endif %}
{% empty %}
- <a href="{% url 'mealitem-add' meal.id %}"
+ <a href="{% url 'nutrition:meal_item:add' meal.id %}"
title="{% trans 'Add one now.' %}"
class="list-group-item list-group-item-success">
{% trans "No items for this meal." %}<br>
@@ -184,7 +184,7 @@ $(document).ready(function() {
{% endfor %}
</div>
{% empty %}
-<a href="{% url 'meal-add' plan.id %}"
+<a href="{% url 'nutrition:meal:add' plan.id %}"
{% auto_link_css flavour "wger-modal-dialog" %}>
{% trans "No meals for this plan." %}<br>
{% trans "Add one now." %}
@@ -192,7 +192,7 @@ $(document).ready(function() {
{% endfor %}
<p style="margin-top:2em;">
- <a href="{% url 'meal-add' plan.id %}"
+ <a href="{% url 'nutrition:meal:add' plan.id %}"
{% auto_link_css flavour "wger-modal-dialog" %}>{% trans "Add a new meal" %}</a>
</p>
@@ -250,7 +250,7 @@ $(document).ready(function() {
{% if plan.has_goal_calories %}
<p>{% blocktrans %}You have selected that this nutritional plan has a
goal amount of calories. Use the calculator or enter the value yourself.{% endblocktrans %}
- <a href="{% url 'calories-calculator' %}">{% trans "That's done here" %}</a>
+ <a href="{% url 'nutrition:calories:view' %}">{% trans "That's done here" %}</a>
</p>
{% endif %}
@@ -324,7 +324,7 @@ $(document).ready(function() {
<h3>{% trans "Options" %}</h3>
-<a href="{% url 'nutrition-export-pdf' plan.id uid token %}"
+<a href="{% url 'nutrition:plan:export-pdf' plan.id uid token %}"
{% auto_link_css flavour %}>
<img src="{% static 'images/icons/save.svg' %}"
width="32"
@@ -334,7 +334,7 @@ $(document).ready(function() {
{% trans "Download as PDF" %}
</a>
-<a href="{% url 'nutrition-edit' plan.id %}"
+<a href="{% url 'nutrition:plan:edit' plan.id %}"
{% auto_link_css flavour "wger-modal-dialog" %}>
<img src="{% static 'images/icons/edit.svg' %}"
width="32"
@@ -343,7 +343,7 @@ $(document).ready(function() {
{% trans "Edit nutrition plan" %}
</a>
-<a href="{% url 'nutrition-copy' plan.id %}"
+<a href="{% url 'nutrition:plan:copy' plan.id %}"
{% auto_link_css flavour %}>
<img src="{% static 'images/icons/copy.svg' %}"
width="32"
@@ -352,7 +352,7 @@ $(document).ready(function() {
{% trans "Make a copy of this nutrition plan" %}
</a>
-<a href="{% url 'nutrition-delete' plan.id %}"
+<a href="{% url 'nutrition:plan:delete' plan.id %}"
{% auto_link_css flavour "wger-modal-dialog" %}>
<img src="{% static 'images/icons/trash.svg' %}"
width="32"
diff --git a/wger/nutrition/templates/plan/overview.html b/wger/nutrition/templates/plan/overview.html
index 53a3b212e..513581511 100644
--- a/wger/nutrition/templates/plan/overview.html
+++ b/wger/nutrition/templates/plan/overview.html
@@ -19,7 +19,7 @@
{% for plan in plans %}
<tr>
<td>
- <a href="{% url 'nutrition-view' plan.id %}">
+ <a href="{% url 'nutrition:plan:view' plan.id %}">
{% if plan.description %}
{{ plan.description }}
{% else %}
@@ -39,7 +39,7 @@
</table>
{% else %}
<p>
- <a href="{% url 'nutrition-add' %}" class="btn btn-default btn-block">
+ <a href="{% url 'nutrition:plan:add' %}" class="btn btn-default btn-block">
{% trans "No nutrition plans." %} {% trans "Add one now." %}
</a>
</p>
@@ -52,7 +52,7 @@
{% block sidebar%}
<h3>{% trans "Options" %}</h3>
<p>
- <a href="{% url 'nutrition-add' %}" id="nutrition-create-new">
+ <a href="{% url 'nutrition:plan:add' %}" id="nutrition-create-new">
<img src="{% static 'images/icons/new.svg' %}"
width="32"
height="32"
@@ -62,7 +62,7 @@
</p>
<p>
- <a href="{% url 'ingredient-list' %}" id="ingredient-overview">
+ <a href="{% url 'nutrition:ingredient:list' %}" id="ingredient-overview">
<img src="{% static 'images/icons/list.svg' %}"
width="32"
height="32"
diff --git a/wger/nutrition/templates/plan/view.html b/wger/nutrition/templates/plan/view.html
index 136e635b5..ca8249545 100644
--- a/wger/nutrition/templates/plan/view.html
+++ b/wger/nutrition/templates/plan/view.html
@@ -47,7 +47,7 @@ function custom_modal_init()
</strong>
<div class="editoptions">
- <a href="{% url 'wger.nutrition.views.meal.delete_meal' meal.id %}"
+ <a href="{% url 'nutrition:meal:delete' meal.id %}"
title="{% trans 'Delete' %}">
<img src="{% static 'images/icons/trash.svg' %}"
width="16"
@@ -55,7 +55,7 @@ function custom_modal_init()
alt="{% trans 'Delete meal' %}"
title="{% trans 'Delete meal' %}">
</a>
- <a href="{% url 'meal-edit' meal.id %}"
+ <a href="{% url 'nutrition:meal:edit' meal.id %}"
title="{% trans 'Edit' %}"
class="wger-modal-dialog">
<img src="{% static 'images/icons/edit.svg' %}"
@@ -64,7 +64,7 @@ function custom_modal_init()
alt="{% trans 'Edit meal' %}"
title="{% trans 'Edit meal' %}">
</a>
- <a href="{% url 'mealitem-add' meal.id %}"
+ <a href="{% url 'nutrition:meal_item:add' meal.id %}"
title="{% trans 'Add' %}"
class="wger-modal-dialog edit-meal">
<img src="{% static 'images/icons/add.svg' %}"
@@ -84,7 +84,7 @@ function custom_modal_init()
{{ item.ingredient.name }}
<span class="editoptions">
- <a href="{% url 'wger.nutrition.views.meal_item.delete_meal_item' item.id %}"
+ <a href="{% url 'nutrition:meal_item:delete' item.id %}"
title="{% trans 'Delete' %}"
class="delete-mealitem">
<img src="{% static 'images/icons/trash.svg' %}"
@@ -92,7 +92,7 @@ function custom_modal_init()
height="16"
alt="{% trans 'Delete' %}">
</a>
- <a href="{% url 'mealitem-edit' item.id %}"
+ <a href="{% url 'nutrition:meal_item:edit' item.id %}"
title="{% trans 'Edit' %}"
class="wger-modal-dialog edit-meal edit-mealitem">
<img src="{% static 'images/icons/edit.svg' %}"
@@ -110,7 +110,7 @@ function custom_modal_init()
{% empty %}
<tr>
<td colspan="7">
- <a href="{% url 'mealitem-add' meal.id %}"
+ <a href="{% url 'nutrition:meal_item:add' meal.id %}"
title="{% trans 'Add one now.' %}"
class="wger-modal-dialog edit-meal btn btn-default btn-block">
{% trans "No items for this meal." %}
@@ -122,7 +122,7 @@ function custom_modal_init()
{% empty %}
<p>
- <a href="{% url 'meal-add' plan.id %}"
+ <a href="{% url 'nutrition:meal:add' plan.id %}"
class="wger-modal-dialog btn btn-default btn-block">
{% trans "No meals for this plan." %}
{% trans "Add one now." %}
@@ -131,7 +131,7 @@ function custom_modal_init()
{% endfor %}
<tr>
<td colspan="6">
- <a href="{% url 'meal-add' plan.id %}"
+ <a href="{% url 'nutrition:meal:add' plan.id %}"
class="wger-modal-dialog">
<img src="{% static 'images/icons/edit.svg' %}"
width="16"
@@ -249,7 +249,7 @@ function custom_modal_init()
{% if plan.has_goal_calories %}
<p>{% blocktrans %}You have selected that this nutritional plan has a
goal amount of calories. Use the calculator or enter the value yourself.{% endblocktrans %}
- <a href="{% url 'calories-calculator' %}">{% trans "That's done here" %}</a>
+ <a href="{% url 'nutrition:calories:view' %}">{% trans "That's done here" %}</a>
</p>
{% endif %}
@@ -258,7 +258,7 @@ function custom_modal_init()
<h3>{% trans "Options" %}</h3>
<p>
-<a href="{% url 'nutrition-export-pdf' plan.id uid token %}"
+<a href="{% url 'nutrition:plan:export-pdf' plan.id uid token %}"
target="_blank">
<img src="{% static 'images/icons/save.svg' %}"
width="32"
@@ -270,7 +270,7 @@ function custom_modal_init()
</p>
<p>
-<a href="{% url 'nutrition-edit' plan.id %}"
+<a href="{% url 'nutrition:plan:edit' plan.id %}"
class="wger-modal-dialog">
<img src="{% static 'images/icons/edit.svg' %}"
width="32"
@@ -282,7 +282,7 @@ function custom_modal_init()
<p>
-<a href="{% url 'nutrition-copy' plan.id %}">
+<a href="{% url 'nutrition:plan:copy' plan.id %}">
<img src="{% static 'images/icons/copy.svg' %}"
width="32"
height="32"
@@ -292,7 +292,7 @@ function custom_modal_init()
</p>
<p>
-<a href="{% url 'nutrition-delete' plan.id %}"
+<a href="{% url 'nutrition:plan:delete' plan.id %}"
class="wger-modal-dialog">
<img src="{% static 'images/icons/trash.svg' %}"
width="32"
diff --git a/wger/nutrition/templates/rate/form.html b/wger/nutrition/templates/rate/form.html
index 1815261f0..192f0ec57 100644
--- a/wger/nutrition/templates/rate/form.html
+++ b/wger/nutrition/templates/rate/form.html
@@ -26,7 +26,7 @@ $(document).ready(function() {
<p>{% blocktrans %}The basal metabolic rate is the amount of energy expended daily
at rest. This is the minimum energy needed for the body to function, without any
additional physical activity.{% endblocktrans %}</p>
-<form action="{% url 'calories-calculate-bmr' %}"
+<form action="{% url 'nutrition:calories:bmr' %}"
method="post"
class="calories-autoform form-horizontal"
id="bmr-form">
@@ -53,7 +53,7 @@ additional physical activity.{% endblocktrans %}</p>
<p>{% blocktrans %}The physical activity level (PAL) is a factor used to to express
the additional physical activity and is used to calculate the total energy
required per day.{% endblocktrans %}</p>
-<form action="{% url 'calories-calculate-activities' %}"
+<form action="{% url 'nutrition:calories:activities' %}"
method="post"
class="form-horizontal calories-autoform"
id="activities-form">
diff --git a/wger/nutrition/templates/units/list.html b/wger/nutrition/templates/units/list.html
index 59018a7a8..bbfb76791 100644
--- a/wger/nutrition/templates/units/list.html
+++ b/wger/nutrition/templates/units/list.html
@@ -19,7 +19,7 @@
{% for unit in unit_list %}
<tr>
<td class="no-hover">
- <a href="{% url 'weight-unit-delete' unit.id %}"
+ <a href="{% url 'nutrition:weight_unit:delete' unit.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 'weight-unit-edit' unit.id %}"
+ <a href="{% url 'nutrition:weight_unit:edit' unit.id %}"
class="wger-modal-dialog">
<img src="{% static 'images/icons/edit.svg' %}"
width="22"
@@ -57,7 +57,7 @@
{% if perms.exercises %}
<h3>{% trans "Options" %}</h3>
<p>
- <a href="{% url 'weight-unit-add' %}"
+ <a href="{% url 'nutrition:weight_unit:add' %}"
{% auto_link_css flavour "wger-modal-dialog" %}>
<img src="{% static 'images/icons/new.svg' %}"
width="32"
diff --git a/wger/nutrition/tests/test_bmi.py b/wger/nutrition/tests/test_bmi.py
index 325c2f516..34c30332c 100644
--- a/wger/nutrition/tests/test_bmi.py
+++ b/wger/nutrition/tests/test_bmi.py
@@ -34,7 +34,7 @@ class BmiTestCase(WorkoutManagerTestCase):
Access the BMI page
'''
- response = self.client.get(reverse('bmi-view'))
+ response = self.client.get(reverse('nutrition:bmi:view'))
self.assertEqual(response.status_code, 200)
def test_calculator(self):
@@ -44,7 +44,7 @@ class BmiTestCase(WorkoutManagerTestCase):
'''
self.user_login('test')
- response = self.client.post(reverse('bmi-calculate'),
+ response = self.client.post(reverse('nutrition:bmi:calculate'),
{'height': 180,
'weight': 80})
self.assertEqual(response.status_code, 200)
@@ -63,7 +63,7 @@ class BmiTestCase(WorkoutManagerTestCase):
# Existing weight entry is old, a new one is created
entry1 = WeightEntry.objects.filter(user=user).latest()
- response = self.client.post(reverse('bmi-calculate'),
+ response = self.client.post(reverse('nutrition:bmi:calculate'),
{'height': 180,
'weight': 80})
self.assertEqual(response.status_code, 200)
@@ -75,7 +75,7 @@ class BmiTestCase(WorkoutManagerTestCase):
entry2.delete()
entry1.creation_date = datetime.date.today()
entry1.save()
- response = self.client.post(reverse('bmi-calculate'),
+ response = self.client.post(reverse('nutrition:bmi:calculate'),
{'height': 180,
'weight': 80})
self.assertEqual(response.status_code, 200)
@@ -85,7 +85,7 @@ class BmiTestCase(WorkoutManagerTestCase):
# No existing entries
WeightEntry.objects.filter(user=user).delete()
- response = self.client.post(reverse('bmi-calculate'),
+ response = self.client.post(reverse('nutrition:bmi:calculate'),
{'height': 180,
'weight': 80})
self.assertEqual(response.status_code, 200)
diff --git a/wger/nutrition/tests/test_calories_calculator.py b/wger/nutrition/tests/test_calories_calculator.py
index 6ddc74e1a..c3b1bbd92 100644
--- a/wger/nutrition/tests/test_calories_calculator.py
+++ b/wger/nutrition/tests/test_calories_calculator.py
@@ -34,7 +34,7 @@ class CaloriesCalculatorTestCase(WorkoutManagerTestCase):
Access the page
'''
- response = self.client.get(reverse('calories-calculator'))
+ response = self.client.get(reverse('nutrition:calories:view'))
self.assertEqual(response.status_code, 200)
def test_calculator(self):
@@ -43,7 +43,7 @@ class CaloriesCalculatorTestCase(WorkoutManagerTestCase):
'''
self.user_login('test')
- response = self.client.post(reverse('calories-calculate-activities'),
+ response = self.client.post(reverse('nutrition:calories:activities'),
{'sleep_hours': 7,
'work_hours': 8,
'work_intensity': 1,
@@ -67,7 +67,7 @@ class CaloriesCalculatorTestCase(WorkoutManagerTestCase):
# Existing weight entry is old, a new one is created
entry1 = WeightEntry.objects.filter(user=user).latest()
- response = self.client.post(reverse('bmi-calculate'),
+ response = self.client.post(reverse('nutrition:bmi:calculate'),
{'height': 180,
'weight': 80})
self.assertEqual(response.status_code, 200)
@@ -79,7 +79,7 @@ class CaloriesCalculatorTestCase(WorkoutManagerTestCase):
entry2.delete()
entry1.creation_date = datetime.date.today()
entry1.save()
- response = self.client.post(reverse('bmi-calculate'),
+ response = self.client.post(reverse('nutrition:bmi:calculate'),
{'height': 180,
'weight': 80})
self.assertEqual(response.status_code, 200)
@@ -89,7 +89,7 @@ class CaloriesCalculatorTestCase(WorkoutManagerTestCase):
# No existing entries
WeightEntry.objects.filter(user=user).delete()
- response = self.client.post(reverse('bmi-calculate'),
+ response = self.client.post(reverse('nutrition:bmi:calculate'),
{'height': 180,
'weight': 80})
self.assertEqual(response.status_code, 200)
@@ -103,7 +103,7 @@ class CaloriesCalculatorTestCase(WorkoutManagerTestCase):
'''
self.user_login('test')
- response = self.client.post(reverse('calories-calculate-bmr'),
+ response = self.client.post(reverse('nutrition:calories:bmr'),
{'age': 30,
'height': 180,
'gender': 1,
@@ -122,7 +122,7 @@ class CaloriesCalculatorTestCase(WorkoutManagerTestCase):
# Existing weight entry is old, a new one is created
entry1 = WeightEntry.objects.filter(user=user).latest()
- response = self.client.post(reverse('calories-calculate-bmr'),
+ response = self.client.post(reverse('nutrition:calories:bmr'),
{'age': 30,
'height': 180,
'gender': 1,
@@ -136,7 +136,7 @@ class CaloriesCalculatorTestCase(WorkoutManagerTestCase):
entry2.delete()
entry1.creation_date = datetime.date.today()
entry1.save()
- response = self.client.post(reverse('calories-calculate-bmr'),
+ response = self.client.post(reverse('nutrition:calories:bmr'),
{'age': 30,
'height': 180,
'gender': 1,
@@ -148,7 +148,7 @@ class CaloriesCalculatorTestCase(WorkoutManagerTestCase):
# No existing entries
WeightEntry.objects.filter(user=user).delete()
- response = self.client.post(reverse('calories-calculate-bmr'),
+ response = self.client.post(reverse('nutrition:calories:bmr'),
{'age': 30,
'height': 180,
'gender': 1,
diff --git a/wger/nutrition/tests/test_copy_plan.py b/wger/nutrition/tests/test_copy_plan.py
index 22ff03ca8..27c2a5d23 100644
--- a/wger/nutrition/tests/test_copy_plan.py
+++ b/wger/nutrition/tests/test_copy_plan.py
@@ -30,7 +30,7 @@ class CopyPlanTestCase(WorkoutManagerTestCase):
'''
# Open the copy nutritional plan form
- response = self.client.get(reverse('nutrition-copy', kwargs={'pk': 4}))
+ response = self.client.get(reverse('nutrition:plan:copy', kwargs={'pk': 4}))
if fail:
self.assertIn(response.status_code, (404, 302))
else:
@@ -38,7 +38,7 @@ class CopyPlanTestCase(WorkoutManagerTestCase):
# Copy the plan
count_before = NutritionPlan.objects.count()
- response = self.client.post(reverse('nutrition-copy', kwargs={'pk': 4}),
+ response = self.client.post(reverse('nutrition:plan:copy', kwargs={'pk': 4}),
{'comment': 'A copied plan'})
count_after = NutritionPlan.objects.count()
@@ -49,7 +49,7 @@ class CopyPlanTestCase(WorkoutManagerTestCase):
self.assertEqual(count_after, 7)
# Test accessing the copied workout
- response = self.client.get(reverse('nutrition-view', kwargs={'id': 4}))
+ response = self.client.get(reverse('nutrition:plan:view', kwargs={'id': 4}))
if fail:
self.assertIn(response.status_code, (404, 302))
diff --git a/wger/nutrition/tests/test_ingredient.py b/wger/nutrition/tests/test_ingredient.py
index e3d2985bc..d5363dd6e 100644
--- a/wger/nutrition/tests/test_ingredient.py
+++ b/wger/nutrition/tests/test_ingredient.py
@@ -38,7 +38,7 @@ class DeleteIngredientTestCase(WorkoutManagerDeleteTestCase):
'''
object_class = Ingredient
- url = 'ingredient-delete'
+ url = 'nutrition:ingredient:delete'
pk = 1
@@ -48,7 +48,7 @@ class EditIngredientTestCase(WorkoutManagerEditTestCase):
'''
object_class = Ingredient
- url = 'ingredient-edit'
+ url = 'nutrition:ingredient:edit'
pk = 1
data = {'name': 'A new name',
'sodium': 2,
@@ -77,7 +77,7 @@ class AddIngredientTestCase(WorkoutManagerAddTestCase):
'''
object_class = Ingredient
- url = 'ingredient-add'
+ url = 'nutrition:ingredient:add'
user_fail = False
data = {'name': 'A new ingredient',
'sodium': 2,
@@ -114,7 +114,7 @@ class IngredientDetailTestCase(WorkoutManagerTestCase):
Tests the ingredient details page
'''
- response = self.client.get(reverse('ingredient-view', kwargs={'id': 6}))
+ response = self.client.get(reverse('nutrition:ingredient:view', kwargs={'id': 6}))
self.assertEqual(response.status_code, 200)
# Correct tab is selected
@@ -132,7 +132,7 @@ class IngredientDetailTestCase(WorkoutManagerTestCase):
self.assertNotContains(response, 'pending review')
# Non-existent ingredients throw a 404.
- response = self.client.get(reverse('ingredient-view', kwargs={'id': 42}))
+ response = self.client.get(reverse('nutrition:ingredient:view', kwargs={'id': 42}))
self.assertEqual(response.status_code, 404)
def test_ingredient_detail_editor(self):
diff --git a/wger/nutrition/tests/test_ingredient_overview.py b/wger/nutrition/tests/test_ingredient_overview.py
index 656debced..1c4ece89d 100644
--- a/wger/nutrition/tests/test_ingredient_overview.py
+++ b/wger/nutrition/tests/test_ingredient_overview.py
@@ -43,33 +43,33 @@ class OverviewPlanTestCase(WorkoutManagerTestCase):
'license_author': 'internet'
}
for i in range(0, 50):
- self.client.post(reverse('ingredient-add'), data)
+ self.client.post(reverse('nutrition:ingredient:add'), data)
# Page exists
self.user_logout()
- response = self.client.get(reverse('ingredient-list'))
+ response = self.client.get(reverse('nutrition:ingredient:list'))
self.assertEqual(response.status_code, 200)
self.assertEqual(len(response.context['ingredients_list']), PAGINATION_OBJECTS_PER_PAGE)
- response = self.client.get(reverse('ingredient-list'), {'page': 2})
+ response = self.client.get(reverse('nutrition:ingredient:list'), {'page': 2})
self.assertEqual(response.status_code, 200)
self.assertEqual(len(response.context['ingredients_list']), PAGINATION_OBJECTS_PER_PAGE)
rest_ingredients = 13
- response = self.client.get(reverse('ingredient-list'), {'page': 3})
+ response = self.client.get(reverse('nutrition:ingredient:list'), {'page': 3})
self.assertEqual(response.status_code, 200)
self.assertEqual(len(response.context['ingredients_list']), rest_ingredients)
# 'last' is a special case
- response = self.client.get(reverse('ingredient-list'), {'page': 'last'})
+ response = self.client.get(reverse('nutrition:ingredient:list'), {'page': 'last'})
self.assertEqual(response.status_code, 200)
self.assertEqual(len(response.context['ingredients_list']), rest_ingredients)
# Page does not exist
- response = self.client.get(reverse('ingredient-list'), {'page': 100})
+ response = self.client.get(reverse('nutrition:ingredient:list'), {'page': 100})
self.assertEqual(response.status_code, 404)
- response = self.client.get(reverse('ingredient-list'), {'page': 'foobar'})
+ response = self.client.get(reverse('nutrition:ingredient:list'), {'page': 'foobar'})
self.assertEqual(response.status_code, 404)
def ingredient_overview(self, logged_in=True, demo=False, admin=False):
@@ -78,7 +78,7 @@ class OverviewPlanTestCase(WorkoutManagerTestCase):
'''
# Page exists
- response = self.client.get(reverse('ingredient-list'))
+ response = self.client.get(reverse('nutrition:ingredient:list'))
self.assertEqual(response.status_code, 200)
# No ingredients pending review
diff --git a/wger/nutrition/tests/test_meal.py b/wger/nutrition/tests/test_meal.py
index 5f5c4e3de..0a223f43e 100644
--- a/wger/nutrition/tests/test_meal.py
+++ b/wger/nutrition/tests/test_meal.py
@@ -32,7 +32,7 @@ class EditMealTestCase(WorkoutManagerEditTestCase):
'''
object_class = Meal
- url = 'meal-edit'
+ url = 'nutrition:meal:edit'
pk = 5
data = {'time': datetime.time(8, 12)}
@@ -43,7 +43,7 @@ class AddMealTestCase(WorkoutManagerAddTestCase):
'''
object_class = Meal
- url = reverse('meal-add', kwargs={'plan_pk': 4})
+ url = reverse('nutrition:meal:add', kwargs={'plan_pk': 4})
data = {'time': datetime.time(9, 2)}
user_success = 'test'
user_fail = 'admin'
@@ -59,7 +59,7 @@ class PlanOverviewTestCase(WorkoutManagerTestCase):
Helper function to test the nutrition plan overview
'''
- response = self.client.get(reverse('nutrition-overview'))
+ response = self.client.get(reverse('nutrition:plan:overview'))
# Page exists
self.assertEqual(response.status_code, 200)
@@ -83,7 +83,7 @@ class PlanDetailTestCase(WorkoutManagerTestCase):
Helper function to test the plan detail view
'''
- response = self.client.get(reverse('nutrition-view', kwargs={'id': 1}))
+ response = self.client.get(reverse('nutrition:plan:view', kwargs={'id': 1}))
# Page exists
if fail:
diff --git a/wger/nutrition/tests/test_meal_item.py b/wger/nutrition/tests/test_meal_item.py
index 087b066b2..810cbd9ba 100644
--- a/wger/nutrition/tests/test_meal_item.py
+++ b/wger/nutrition/tests/test_meal_item.py
@@ -28,7 +28,7 @@ class EditMealItemUnitTestCase(WorkoutManagerEditTestCase):
'''
object_class = MealItem
- url = 'mealitem-edit'
+ url = 'nutrition:meal_item:edit'
pk = 4
data = {'amount': 1,
'ingredient': 1,
@@ -41,7 +41,7 @@ class EditMealItemWeightTestCase(WorkoutManagerEditTestCase):
'''
object_class = MealItem
- url = 'mealitem-edit'
+ url = 'nutrition:meal_item:edit'
pk = 4
data = {'amount': 100,
'ingredient': 1}
@@ -53,7 +53,7 @@ class AddMealItemUnitTestCase(WorkoutManagerAddTestCase):
'''
object_class = MealItem
- url = reverse('mealitem-add', kwargs={'meal_id': 3})
+ url = reverse('nutrition:meal_item:add', kwargs={'meal_id': 3})
data = {'amount': 1,
'ingredient': 1,
'weight_unit': 1}
@@ -65,7 +65,7 @@ class AddMealItemWeightTestCase(WorkoutManagerAddTestCase):
'''
object_class = MealItem
- url = reverse('mealitem-add', kwargs={'meal_id': 3})
+ url = reverse('nutrition:meal_item:add', kwargs={'meal_id': 3})
data = {'amount': 100,
'ingredient': 1}
diff --git a/wger/nutrition/tests/test_pdf.py b/wger/nutrition/tests/test_pdf.py
index 56fd22ba7..c0e06f6a3 100644
--- a/wger/nutrition/tests/test_pdf.py
+++ b/wger/nutrition/tests/test_pdf.py
@@ -34,7 +34,7 @@ class NutritionalPlanPdfExportTestCase(WorkoutManagerTestCase):
user = User.objects.get(pk=2)
uid, token = make_token(user)
- response = self.client.get(reverse('nutrition-export-pdf',
+ response = self.client.get(reverse('nutrition:plan:export-pdf',
kwargs={'id': 4,
'uidb64': uid,
'token': token}))
@@ -54,7 +54,7 @@ class NutritionalPlanPdfExportTestCase(WorkoutManagerTestCase):
'''
# Get a plan
- response = self.client.get(reverse('nutrition-export-pdf',
+ response = self.client.get(reverse('nutrition:plan:export-pdf',
kwargs={'id': 4}))
if fail:
@@ -76,7 +76,7 @@ class NutritionalPlanPdfExportTestCase(WorkoutManagerTestCase):
plan.user = user
plan.language = language
plan.save()
- response = self.client.get(reverse('nutrition-export-pdf',
+ response = self.client.get(reverse('nutrition:plan:export-pdf',
kwargs={'id': plan.id}))
if fail:
diff --git a/wger/nutrition/tests/test_plan.py b/wger/nutrition/tests/test_plan.py
index 321968c91..4c2553230 100644
--- a/wger/nutrition/tests/test_plan.py
+++ b/wger/nutrition/tests/test_plan.py
@@ -28,7 +28,7 @@ class DeletePlanTestCase(WorkoutManagerDeleteTestCase):
'''
object_class = NutritionPlan
- url = 'nutrition-delete'
+ url = 'nutrition:plan:delete'
pk = 2
@@ -38,7 +38,7 @@ class EditPlanTestCase(WorkoutManagerEditTestCase):
'''
object_class = NutritionPlan
- url = 'nutrition-edit'
+ url = 'nutrition:plan:edit'
pk = 2
data = {'description': 'My new description'}
@@ -55,7 +55,7 @@ class PlanDailyCaloriesTestCase(WorkoutManagerTestCase):
self.user_login('test')
# Can't find goal calories text
- response = self.client.get(reverse('nutrition-view', kwargs={'id': 1}))
+ response = self.client.get(reverse('nutrition:plan:view', kwargs={'id': 1}))
self.assertFalse(response.context['plan'].has_goal_calories)
self.assertEqual(response.status_code, 200)
@@ -73,7 +73,7 @@ class PlanDailyCaloriesTestCase(WorkoutManagerTestCase):
plan.save()
# Can find goal calories text
- response = self.client.get(reverse('nutrition-view', kwargs={'id': 1}))
+ response = self.client.get(reverse('nutrition:plan:view', kwargs={'id': 1}))
self.assertTrue(response.context['plan'].has_goal_calories)
self.assertEqual(response.status_code, 200)
self.assertContains(response, 'goal amount of calories')
diff --git a/wger/nutrition/tests/test_submitted_ingredient.py b/wger/nutrition/tests/test_submitted_ingredient.py
index 853f49330..c19cd0994 100644
--- a/wger/nutrition/tests/test_submitted_ingredient.py
+++ b/wger/nutrition/tests/test_submitted_ingredient.py
@@ -29,7 +29,7 @@ class IngredientsPendingTestCase(WorkoutManagerTestCase):
'''
Helper function
'''
- response = self.client.get(reverse('ingredient-pending'))
+ response = self.client.get(reverse('nutrition:ingredient:pending'))
if not fail:
self.assertEqual(response.status_code, 200)
self.assertEqual(len(response.context['ingredient_list']), 1)
@@ -69,7 +69,7 @@ class IngredientsPendingDetailTestCase(WorkoutManagerTestCase):
'''
Helper function
'''
- response = self.client.get(reverse('ingredient-view', kwargs={'id': 7}))
+ response = self.client.get(reverse('nutrition:ingredient:view', kwargs={'id': 7}))
self.assertContains(response, 'pending review')
if not fail:
@@ -117,7 +117,7 @@ class IngredientAcceptTestCase(WorkoutManagerTestCase):
'''
ingredient = Ingredient.objects.get(pk=7)
self.assertEqual(ingredient.status, Ingredient.INGREDIENT_STATUS_PENDING)
- response = self.client.get(reverse('ingredient-accept', kwargs={'pk': 7}))
+ response = self.client.get(reverse('nutrition:ingredient:accept', kwargs={'pk': 7}))
ingredient = Ingredient.objects.get(pk=7)
self.assertEqual(response.status_code, 302)
@@ -165,7 +165,7 @@ class IngredientRejectTestCase(WorkoutManagerTestCase):
'''
ingredient = Ingredient.objects.get(pk=7)
self.assertEqual(ingredient.status, Ingredient.INGREDIENT_STATUS_PENDING)
- response = self.client.get(reverse('ingredient-decline', kwargs={'pk': 7}))
+ response = self.client.get(reverse('nutrition:ingredient:decline', kwargs={'pk': 7}))
ingredient = Ingredient.objects.get(pk=7)
self.assertEqual(response.status_code, 302)
diff --git a/wger/nutrition/tests/test_weight_unit.py b/wger/nutrition/tests/test_weight_unit.py
index 74cb1080c..d48a5d734 100644
--- a/wger/nutrition/tests/test_weight_unit.py
+++ b/wger/nutrition/tests/test_weight_unit.py
@@ -32,7 +32,7 @@ class AddWeightUnitTestCase(WorkoutManagerAddTestCase):
'''
object_class = WeightUnit
- url = 'weight-unit-add'
+ url = 'nutrition:weight_unit:add'
data = {'name': 'A new weight unit'}
@@ -42,7 +42,7 @@ class DeleteWeightUnitTestCase(WorkoutManagerDeleteTestCase):
'''
object_class = WeightUnit
- url = 'weight-unit-delete'
+ url = 'nutrition:weight_unit:delete'
pk = 1
@@ -52,7 +52,7 @@ class EditWeightUnitTestCase(WorkoutManagerEditTestCase):
'''
object_class = WeightUnit
- url = 'weight-unit-edit'
+ url = 'nutrition:weight_unit:edit'
pk = 1
data = {'name': 'A new name'}
@@ -69,31 +69,31 @@ class WeightUnitOverviewTestCase(WorkoutManagerTestCase):
data = {"name": "A new, cool unit",
"language": 2}
for i in range(0, 50):
- self.client.post(reverse('weight-unit-add'), data)
+ self.client.post(reverse('nutrition:weight_unit:add'), data)
# Page exists and the pagination works
- response = self.client.get(reverse('weight-unit-list'))
+ response = self.client.get(reverse('nutrition:weight_unit:list'))
self.assertEqual(response.status_code, 200)
self.assertEqual(len(response.context['unit_list']), PAGINATION_OBJECTS_PER_PAGE)
- response = self.client.get(reverse('weight-unit-list'), {'page': 2})
+ response = self.client.get(reverse('nutrition:weight_unit:list'), {'page': 2})
self.assertEqual(response.status_code, 200)
self.assertEqual(len(response.context['unit_list']), PAGINATION_OBJECTS_PER_PAGE)
- response = self.client.get(reverse('weight-unit-list'), {'page': 3})
+ response = self.client.get(reverse('nutrition:weight_unit:list'), {'page': 3})
self.assertEqual(response.status_code, 200)
self.assertEqual(len(response.context['unit_list']), 3)
# 'last' is a special case
- response = self.client.get(reverse('weight-unit-list'), {'page': 'last'})
+ response = self.client.get(reverse('nutrition:weight_unit:list'), {'page': 'last'})
self.assertEqual(response.status_code, 200)
self.assertEqual(len(response.context['unit_list']), 3)
# Page does not exist
- response = self.client.get(reverse('weight-unit-list'), {'page': 100})
+ response = self.client.get(reverse('nutrition:weight_unit:list'), {'page': 100})
self.assertEqual(response.status_code, 404)
- response = self.client.get(reverse('weight-unit-list'), {'page': 'foobar'})
+ response = self.client.get(reverse('nutrition:weight_unit:list'), {'page': 'foobar'})
self.assertEqual(response.status_code, 404)
diff --git a/wger/nutrition/tests/test_weight_unit_ingredient.py b/wger/nutrition/tests/test_weight_unit_ingredient.py
index 60f9d2a5c..25c4aeea3 100644
--- a/wger/nutrition/tests/test_weight_unit_ingredient.py
+++ b/wger/nutrition/tests/test_weight_unit_ingredient.py
@@ -32,7 +32,7 @@ class AddWeightUnitIngredientTestCase(WorkoutManagerAddTestCase):
'''
object_class = IngredientWeightUnit
- url = reverse_lazy('weight-unit-ingredient-add',
+ url = reverse_lazy('nutrition:unit_ingredient:add',
kwargs={'ingredient_pk': 1})
data = {'unit': 5,
'gram': 123,
@@ -45,7 +45,7 @@ class DeleteWeightUnitIngredientTestCase(WorkoutManagerDeleteTestCase):
'''
object_class = IngredientWeightUnit
- url = 'weight-unit-ingredient-delete'
+ url = 'nutrition:unit_ingredient:delete'
pk = 1
@@ -55,7 +55,7 @@ class EditWeightUnitTestCase(WorkoutManagerEditTestCase):
'''
object_class = IngredientWeightUnit
- url = 'weight-unit-ingredient-edit'
+ url = 'nutrition:unit_ingredient:edit'
pk = 1
data = {'unit': 5,
'gram': 10,
@@ -72,7 +72,7 @@ class WeightUnitFormTestCase(WorkoutManagerTestCase):
Tests the form in the add view
'''
self.user_login('admin')
- response = self.client.get(reverse('weight-unit-ingredient-add',
+ response = self.client.get(reverse('nutrition:unit_ingredient:add',
kwargs={'ingredient_pk': 1}))
choices = [text for value, text in response.context['form']['unit'].field.choices]
@@ -87,7 +87,7 @@ class WeightUnitFormTestCase(WorkoutManagerTestCase):
Tests that the form in the edit view only shows weigh units in the user's language
'''
self.user_login('admin')
- response = self.client.get(reverse('weight-unit-ingredient-edit',
+ response = self.client.get(reverse('nutrition:unit_ingredient:edit',
kwargs={'pk': 1}))
choices = [text for value, text in response.context['form']['unit'].field.choices]
diff --git a/wger/nutrition/urls.py b/wger/nutrition/urls.py
index 734ee797d..5637d0766 100644
--- a/wger/nutrition/urls.py
+++ b/wger/nutrition/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.nutrition.views import ingredient
@@ -27,124 +27,161 @@ from wger.nutrition.views import meal_item
from wger.nutrition.views import unit
from wger.nutrition.views import unit_ingredient
-urlpatterns = patterns('wger.nutrition.views',
- # Plans
+# sub patterns for nutritional plans
+patterns_plan = patterns('',
url(r'^overview/$',
plan.overview,
- name='nutrition-overview'),
+ name='overview'),
url(r'^add/$',
plan.add,
- name='nutrition-add'),
+ name='add'),
url(r'^(?P<id>\d+)/view/$',
plan.view,
- name='nutrition-view'),
+ name='view'),
url(r'^(?P<pk>\d+)/copy/$',
plan.copy,
- name='nutrition-copy'),
+ name='copy'),
url(r'^(?P<pk>\d+)/delete/$',
login_required(plan.PlanDeleteView.as_view()),
- name='nutrition-delete'),
+ name='delete'),
url(r'^(?P<pk>\d+)/edit/$',
login_required(plan.PlanEditView.as_view()),
- name='nutrition-edit'),
+ name='edit'),
url(r'^(?P<id>\d+)/pdf/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})$',
plan.export_pdf,
- name='nutrition-export-pdf'),
+ name='export-pdf'),
url(r'^(?P<id>\d+)/pdf/$',
plan.export_pdf,
- name='nutrition-export-pdf'),
+ name='export-pdf'),
+)
+
- # Meals
+# sub patterns for meals
+patterns_meal = patterns('',
url(r'^(?P<plan_pk>\d+)/meal/add/$',
login_required(meal.MealCreateView.as_view()),
- name='meal-add'),
- url(r'^meal/(?P<pk>\d+)/edit/$',
+ name='add'),
+ url(r'^(?P<pk>\d+)/edit/$',
login_required(meal.MealEditView.as_view()),
- name='meal-edit'),
- url(r'^meal/(?P<id>\d+)/delete/$', 'meal.delete_meal'),
+ name='edit'),
+ url(r'^(?P<id>\d+)/delete/$',
+ meal.delete_meal,
+ name='delete'),
+)
- # Meal items
- url(r'^meal/(?P<meal_id>\d+)/item/add/$',
+
+# sub patterns for meal items
+patterns_meal_item = patterns('',
+ url(r'^(?P<meal_id>\d+)/item/add/$',
login_required(meal_item.MealItemCreateView.as_view()),
- name='mealitem-add'),
- url(r'^meal/item/(?P<pk>\d+)/edit/$',
+ name='add'),
+ url(r'^(?P<pk>\d+)/edit/$',
login_required(meal_item.MealItemEditView.as_view()),
- name='mealitem-edit'),
- url(r'^meal/item/(?P<item_id>\d+)/delete/$', 'meal_item.delete_meal_item'),
+ name='edit'),
+ url(r'^(?P<item_id>\d+)/delete/$',
+ meal_item.delete_meal_item,
+ name='delete'),
+)
+
- # Ingredients
- url(r'^ingredient/(?P<pk>\d+)/delete/$',
+# sub patterns for ingredient
+patterns_ingredient = patterns('',
+ url(r'^(?P<pk>\d+)/delete/$',
ingredient.IngredientDeleteView.as_view(),
- name='ingredient-delete'),
- url(r'^ingredient/(?P<pk>\d+)/edit/$',
+ name='delete'),
+ url(r'^(?P<pk>\d+)/edit/$',
ingredient.IngredientEditView.as_view(),
- name='ingredient-edit'),
- url(r'^ingredient/add/$',
+ name='edit'),
+ url(r'^add/$',
login_required(ingredient.IngredientCreateView.as_view()),
- name='ingredient-add'),
- url(r'^ingredient/overview/$',
+ name='add'),
+ url(r'^overview/$',
ingredient.IngredientListView.as_view(),
- name='ingredient-list'),
+ name='list'),
url(r'^pending/$',
ingredient.PendingIngredientListView.as_view(),
- name='ingredient-pending'),
+ name='pending'),
url(r'^(?P<pk>\d+)/accept/$',
ingredient.accept,
- name='ingredient-accept'),
+ name='accept'),
url(r'^(?P<pk>\d+)/decline/$',
ingredient.decline,
- name='ingredient-decline'),
- url(r'^ingredient/(?P<id>\d+)/view/$',
+ name='decline'),
+ url(r'^(?P<id>\d+)/view/$',
ingredient.view,
- name='ingredient-view'),
- url(r'^ingredient/(?P<id>\d+)/view/(?P<slug>[-\w]+)/$',
+ name='view'),
+ url(r'^(?P<id>\d+)/view/(?P<slug>[-\w]+)/$',
ingredient.view,
- name='ingredient-view'),
+ name='view'),
+)
+
- # Ingredient units
- url(r'^ingredient/unit/list/$',
+# sub patterns for weight units
+patterns_weight_unit = patterns('',
+ url(r'^list/$',
unit.WeightUnitListView.as_view(),
- name='weight-unit-list'),
- url(r'^ingredient/unit/add/$',
+ name='list'),
+ url(r'^add/$',
unit.WeightUnitCreateView.as_view(),
- name='weight-unit-add'),
- url(r'^ingredient/unit/(?P<pk>\d+)/delete/$',
+ name='add'),
+ url(r'^(?P<pk>\d+)/delete/$',
unit.WeightUnitDeleteView.as_view(),
- name='weight-unit-delete'),
- url(r'^ingredient/unit/(?P<pk>\d+)/edit/$',
+ name='delete'),
+ url(r'^(?P<pk>\d+)/edit/$',
unit.WeightUnitUpdateView.as_view(),
- name='weight-unit-edit'),
+ name='edit'),
+)
- # Ingredient to weight units cross table
- url(r'^ingredient/unit-to-ingredient/add/(?P<ingredient_pk>\d+)/$',
+
+# sub patterns for weight units / ingredient cross table
+patterns_unit_ingredient = patterns('',
+ url(r'^add/(?P<ingredient_pk>\d+)/$',
unit_ingredient.WeightUnitIngredientCreateView.as_view(),
- name='weight-unit-ingredient-add'),
- url(r'^ingredient/unit-to-ingredient/(?P<pk>\d+)/edit/$',
+ name='add'),
+ url(r'^(?P<pk>\d+)/edit/$',
unit_ingredient.WeightUnitIngredientUpdateView.as_view(),
- name='weight-unit-ingredient-edit'),
- url(r'^ingredient/unit-to-ingredient/(?P<pk>\d+)/delete/$',
+ name='edit'),
+ url(r'^(?P<pk>\d+)/delete/$',
unit_ingredient.WeightUnitIngredientDeleteView.as_view(),
- name='weight-unit-ingredient-delete'),
+ name='delete'),
+)
+
- # BMI
- url(r'^calculator/bmi$',
+# sub patterns for BMI calculator
+patterns_bmi = patterns('',
+ url(r'^$',
bmi.view,
- name='bmi-view'),
- url(r'^calculator/bmi/calculate$',
+ name='view'),
+ url(r'^calculate$',
bmi.calculate,
- name='bmi-calculate'),
- url(r'^calculator/bmi/chart-data$',
+ name='calculate'),
+ url(r'^chart-data$',
bmi.chart_data,
- name='bmi-chart-data'), # JS
+ name='chart-data'), # JS
+)
+
- # Calories calculator
- url(r'^calculator/calories$',
+# sub patterns for calories calculator
+patterns_calories = patterns('',
+ url(r'^$',
calculator.view,
- name='calories-calculator'),
- url(r'^calculator/calories/bmr$',
+ name='view'),
+ url(r'^bmr$',
calculator.calculate_bmr,
- name='calories-calculate-bmr'),
- url(r'^calculator/calories/activities$',
+ name='bmr'),
+ url(r'^activities$',
calculator.calculate_activities,
- name='calories-calculate-activities'), # JS
+ name='activities'), # JS
+)
+
+
+urlpatterns = patterns('',
+ url(r'^', include(patterns_plan, namespace="plan")),
+ url(r'^meal/', include(patterns_meal, namespace="meal")),
+ url(r'^meal/item/', include(patterns_meal_item, namespace="meal_item")),
+ url(r'^ingredient/', include(patterns_ingredient, namespace="ingredient")),
+ url(r'^unit/', include(patterns_weight_unit, namespace="weight_unit")),
+ url(r'^unit-to-ingredient/', include(patterns_unit_ingredient, namespace="unit_ingredient")),
+ url(r'^calculator/bmi/', include(patterns_bmi, namespace="bmi")),
+ url(r'^calculator/calories/', include(patterns_calories, namespace="calories")),
)
diff --git a/wger/nutrition/views/ingredient.py b/wger/nutrition/views/ingredient.py
index 484cb8ada..39ece8788 100644
--- a/wger/nutrition/views/ingredient.py
+++ b/wger/nutrition/views/ingredient.py
@@ -93,7 +93,7 @@ class IngredientDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):
model = Ingredient
template_name = 'delete.html'
- success_url = reverse_lazy('ingredient-list')
+ success_url = reverse_lazy('nutrition:ingredient:list')
messages = ugettext_lazy('Ingredient successfully deleted')
permission_required = 'nutrition.delete_ingredient'
@@ -102,7 +102,8 @@ class IngredientDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):
context = super(IngredientDeleteView, self).get_context_data(**kwargs)
context['title'] = _(u'Delete {0}?').format(self.object.name)
- context['form_action'] = reverse('ingredient-delete', kwargs={'pk': self.object.id})
+ context['form_action'] = reverse('nutrition:ingredient:delete',
+ kwargs={'pk': self.object.id})
return context
@@ -131,7 +132,7 @@ class IngredientEditView(IngredientMixin, UpdateView, WgerPermissionMixin):
model = Ingredient
title = ugettext_lazy('Edit ingredient')
- form_action_urlname = 'ingredient-edit'
+ form_action_urlname = 'nutrition:ingredient:edit'
messages = ugettext_lazy('Ingredient successfully updated')
permission_required = 'nutrition.change_ingredient'
@@ -143,7 +144,7 @@ class IngredientCreateView(IngredientMixin, CreateView):
model = Ingredient
title = ugettext_lazy('Add a new ingredient')
- form_action = reverse_lazy('ingredient-add')
+ form_action = reverse_lazy('nutrition:ingredient:add')
sidebar = 'ingredient/form.html'
def form_valid(self, form):
diff --git a/wger/nutrition/views/meal.py b/wger/nutrition/views/meal.py
index 574ec3728..8dea56d62 100644
--- a/wger/nutrition/views/meal.py
+++ b/wger/nutrition/views/meal.py
@@ -53,12 +53,12 @@ class MealCreateView(WgerFormMixin, CreateView):
return super(MealCreateView, self).form_valid(form)
def get_success_url(self):
- return reverse('nutrition-view', kwargs={'id': self.object.plan.id})
+ return reverse('nutrition:plan:view', kwargs={'id': self.object.plan.id})
# Send some additional data to the template
def get_context_data(self, **kwargs):
context = super(MealCreateView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('meal-add',
+ context['form_action'] = reverse('nutrition:meal:add',
kwargs={'plan_pk': self.kwargs['plan_pk']})
return context
@@ -71,10 +71,10 @@ class MealEditView(WgerFormMixin, UpdateView):
model = Meal
title = ugettext_lazy('Edit meal')
- form_action_urlname = 'meal-edit'
+ form_action_urlname = 'nutrition:meal:edit'
def get_success_url(self):
- return reverse('nutrition-view', kwargs={'id': self.object.plan.id})
+ return reverse('nutrition:plan:view', kwargs={'id': self.object.plan.id})
@login_required
@@ -90,6 +90,6 @@ def delete_meal(request, id):
# Only delete if the user is the owner
if plan.user == request.user:
meal.delete()
- return HttpResponseRedirect(reverse('nutrition-view', kwargs={'id': plan.id}))
+ return HttpResponseRedirect(reverse('nutrition:plan:view', kwargs={'id': plan.id}))
else:
return HttpResponseForbidden()
diff --git a/wger/nutrition/views/meal_item.py b/wger/nutrition/views/meal_item.py
index dc99feeb7..46fdccbb1 100644
--- a/wger/nutrition/views/meal_item.py
+++ b/wger/nutrition/views/meal_item.py
@@ -81,7 +81,7 @@ def delete_meal_item(request, item_id):
# Only delete if the user is the owner
if plan.user == request.user:
item.delete()
- return HttpResponseRedirect(reverse('nutrition-view', kwargs={'id': plan.id}))
+ return HttpResponseRedirect(reverse('nutrition:plan:view', kwargs={'id': plan.id}))
else:
return HttpResponseForbidden()
@@ -107,14 +107,15 @@ class MealItemCreateView(WgerFormMixin, CreateView):
return HttpResponseForbidden()
def get_success_url(self):
- return reverse('nutrition-view', kwargs={'id': self.meal.plan.id})
+ return reverse('nutrition:plan:view', kwargs={'id': self.meal.plan.id})
def get_context_data(self, **kwargs):
'''
Send some additional data to the template
'''
context = super(MealItemCreateView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('mealitem-add', kwargs={'meal_id': self.meal.id})
+ context['form_action'] = reverse('nutrition:meal_item:add',
+ kwargs={'meal_id': self.meal.id})
context['ingredient_searchfield'] = self.request.POST.get('ingredient_searchfield', '')
return context
@@ -135,11 +136,11 @@ class MealItemEditView(WgerFormMixin, UpdateView):
model = MealItem
form_class = MealItemForm
title = ugettext_lazy('Edit meal item')
- form_action_urlname = 'mealitem-edit'
+ form_action_urlname = 'nutrition:meal_item:edit'
template_name = 'meal_item/edit.html'
def get_success_url(self):
- return reverse('nutrition-view', kwargs={'id': self.object.meal.plan.id})
+ return reverse('nutrition:plan:view', kwargs={'id': self.object.meal.plan.id})
def get_context_data(self, **kwargs):
'''
diff --git a/wger/nutrition/views/plan.py b/wger/nutrition/views/plan.py
index e368feba7..8b3403c10 100644
--- a/wger/nutrition/views/plan.py
+++ b/wger/nutrition/views/plan.py
@@ -80,7 +80,7 @@ def add(request):
plan.language = load_language()
plan.save()
- return HttpResponseRedirect(reverse('nutrition-view', kwargs={'id': plan.id}))
+ return HttpResponseRedirect(reverse('nutrition:plan:view', kwargs={'id': plan.id}))
class PlanDeleteView(WgerDeleteMixin, DeleteView):
@@ -89,9 +89,9 @@ class PlanDeleteView(WgerDeleteMixin, DeleteView):
'''
model = NutritionPlan
- success_url = reverse_lazy('nutrition-overview')
+ success_url = reverse_lazy('nutrition:plan:overview')
title = ugettext_lazy('Delete nutritional plan?')
- form_action_urlname = 'nutrition-delete'
+ form_action_urlname = 'nutrition:plan:delete'
messages = ugettext_lazy('Nutritional plan was successfully deleted')
@@ -102,7 +102,7 @@ class PlanEditView(WgerFormMixin, UpdateView):
model = NutritionPlan
title = ugettext_lazy('Edit nutritional plan')
- form_action_urlname = 'nutrition-edit'
+ form_action_urlname = 'nutrition:plan:edit'
@login_required
@@ -165,7 +165,7 @@ def copy(request, pk):
item.save()
# Redirect
- return HttpResponseRedirect(reverse('nutrition-view', kwargs={'id': plan.id}))
+ return HttpResponseRedirect(reverse('nutrition:plan:view', kwargs={'id': plan.id}))
def export_pdf(request, id, uidb64=None, token=None):
@@ -337,7 +337,7 @@ def export_pdf(request, id, uidb64=None, token=None):
# Footer, date and info
elements.append(Spacer(10*cm, 0.5*cm))
created = datetime.date.today().strftime("%d.%m.%Y")
- url = reverse('nutrition-view', kwargs={'id': plan.id})
+ url = reverse('nutrition:plan:view', kwargs={'id': plan.id})
p = Paragraph('''<para align="left">
%(date)s -
<a href="%(url)s">%(url)s</a> -
diff --git a/wger/nutrition/views/unit.py b/wger/nutrition/views/unit.py
index ae456f188..fdc465cfb 100644
--- a/wger/nutrition/views/unit.py
+++ b/wger/nutrition/views/unit.py
@@ -63,11 +63,11 @@ class WeightUnitCreateView(WgerFormMixin, CreateView, WgerPermissionMixin):
model = WeightUnit
title = ugettext_lazy('Add new weight unit')
- form_action = reverse_lazy('weight-unit-add')
+ form_action = reverse_lazy('nutrition:weight_unit:add')
permission_required = 'nutrition.add_ingredientweightunit'
def get_success_url(self):
- return reverse('weight-unit-list')
+ return reverse('nutrition:weight_unit:list')
def form_valid(self, form):
form.instance.language = load_language()
@@ -80,9 +80,9 @@ class WeightUnitDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):
'''
model = WeightUnit
- success_url = reverse_lazy('weight-unit-list')
+ success_url = reverse_lazy('nutrition:weight_unit:list')
title = ugettext_lazy('Delete weight unit?')
- form_action_urlname = 'weight-unit-delete'
+ form_action_urlname = 'nutrition:weight_unit:delete'
permission_required = 'nutrition.delete_ingredientweightunit'
@@ -93,8 +93,8 @@ class WeightUnitUpdateView(WgerFormMixin, UpdateView, WgerPermissionMixin):
model = WeightUnit
title = ugettext_lazy('Edit a weight unit')
- form_action_urlname = 'weight-unit-edit'
+ form_action_urlname = 'nutrition:weight_unit:edit'
permission_required = 'nutrition.change_ingredientweightunit'
def get_success_url(self):
- return reverse('weight-unit-list')
+ return reverse('nutrition:weight_unit:list')
diff --git a/wger/nutrition/views/unit_ingredient.py b/wger/nutrition/views/unit_ingredient.py
index 0e04a2aae..67e9d2d38 100644
--- a/wger/nutrition/views/unit_ingredient.py
+++ b/wger/nutrition/views/unit_ingredient.py
@@ -55,12 +55,12 @@ class WeightUnitIngredientCreateView(WgerFormMixin, CreateView, WgerPermissionMi
# Send some additional data to the template
def get_context_data(self, **kwargs):
context = super(WeightUnitIngredientCreateView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('weight-unit-ingredient-add',
+ context['form_action'] = reverse('nutrition:unit_ingredient:add',
kwargs={'ingredient_pk': self.kwargs['ingredient_pk']})
return context
def get_success_url(self):
- return reverse('ingredient-view', kwargs={'id': self.kwargs['ingredient_pk']})
+ return reverse('nutrition:ingredient:view', kwargs={'id': self.kwargs['ingredient_pk']})
def form_valid(self, form):
ingredient = get_object_or_404(Ingredient, pk=self.kwargs['ingredient_pk'])
@@ -88,11 +88,11 @@ class WeightUnitIngredientUpdateView(WgerFormMixin, UpdateView, WgerPermissionMi
model = IngredientWeightUnit
title = ugettext_lazy('Edit a weight unit to ingredient connection')
- form_action_urlname = 'weight-unit-ingredient-edit'
+ form_action_urlname = 'nutrition:unit_ingredient:edit'
permission_required = 'nutrition.add_ingredientweightunit'
def get_success_url(self):
- return reverse('ingredient-view', kwargs={'id': self.object.ingredient.id})
+ return reverse('nutrition:ingredient:view', kwargs={'id': self.object.ingredient.id})
def get_form_class(self):
'''
@@ -115,8 +115,8 @@ class WeightUnitIngredientDeleteView(WgerDeleteMixin, DeleteView, WgerPermission
model = IngredientWeightUnit
title = ugettext_lazy('Delete weight unit?')
- form_action_urlname = 'weight-unit-ingredient-delete'
+ form_action_urlname = 'nutrition:unit_ingredient:delete'
permission_required = 'nutrition.add_ingredientweightunit'
def get_success_url(self):
- return reverse('ingredient-view', kwargs={'id': self.object.ingredient.id})
+ return reverse('nutrition:ingredient:view', kwargs={'id': self.object.ingredient.id})
diff --git a/wger/urls.py b/wger/urls.py
index 39fe1b5b7..3368a4327 100644
--- a/wger/urls.py
+++ b/wger/urls.py
@@ -135,7 +135,7 @@ urlpatterns = i18n_patterns('',
url(r'^', include('wger.manager.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'nutrition/', include('wger.nutrition.urls', namespace='nutrition')),
url(r'software/', include('wger.software.urls', namespace='software', app_name='software')),
url(r'config/', include('wger.config.urls', namespace='config', app_name='config')),
url(r'gym/', include('wger.gym.urls', namespace='gym', app_name='gym')),
diff --git a/wger/utils/tests/test_middleware.py b/wger/utils/tests/test_middleware.py
index 3e394040e..ca2129005 100644
--- a/wger/utils/tests/test_middleware.py
+++ b/wger/utils/tests/test_middleware.py
@@ -59,13 +59,13 @@ class RobotsExclusionMiddlewareTestCase(WorkoutManagerTestCase):
Test the middleware on URLs from nutrition app
'''
- response = self.client.get(reverse('ingredient-list'))
+ response = self.client.get(reverse('nutrition:ingredient:list'))
self.assertFalse(response.get('X-Robots-Tag'))
- response = self.client.get(reverse('ingredient-view', kwargs={'id': 1}))
+ response = self.client.get(reverse('nutrition:ingredient:view', kwargs={'id': 1}))
self.assertFalse(response.get('X-Robots-Tag'))
- response = self.client.get(reverse('nutrition-overview'))
+ response = self.client.get(reverse('nutrition:plan:overview'))
self.assertTrue(response.get('X-Robots-Tag'))
def test_middleware_exercises(self):