Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Use named urls in templates and code

Roland Geider314e7f5cf180
diff --git a/wger/exercises/models.py b/wger/exercises/models.py
index 78979d1eb..b2aac04e8 100644
--- a/wger/exercises/models.py
+++ b/wger/exercises/models.py
@@ -247,8 +247,7 @@ class Exercise(models.Model):
'''
Returns the canonical URL to view an exercise
'''
- return reverse('wger.exercises.views.exercises.view',
- kwargs={'id': self.id, 'slug': slugify(self.name)})
+ return reverse('exercise-view', kwargs={'id': self.id, 'slug': slugify(self.name)})
def save(self, *args, **kwargs):
'''
diff --git a/wger/exercises/templates/exercise_search.html b/wger/exercises/templates/exercise_search.html
index b927cd564..d4ef768e5 100644
--- a/wger/exercises/templates/exercise_search.html
+++ b/wger/exercises/templates/exercise_search.html
@@ -21,7 +21,7 @@
<ul>
{% for exercise in exercises %}
- <li><a href="{% url 'wger.exercises.views.exercises.view' exercise.id %}">{{ exercise.name }}</a></li>
+ <li><a href="{% url 'exercise-view' exercise.id %}">{{ exercise.name }}</a></li>
{% endfor %}
</ul>
diff --git a/wger/exercises/templates/mobile/view.html b/wger/exercises/templates/mobile/view.html
index eefde1c65..d577d87f2 100644
--- a/wger/exercises/templates/mobile/view.html
+++ b/wger/exercises/templates/mobile/view.html
@@ -303,7 +303,7 @@ $(document).ready(function() {
<h3>{% trans "Options" %}</h3>
<p>
- <a href="{% url 'wger.exercises.views.exercises.overview' %}"
+ <a href="{% url 'exercise-overview' %}"
data-role="button">
<img src="{% static 'images/icons/list.svg' %}"
width="32"
diff --git a/wger/exercises/templates/view.html b/wger/exercises/templates/view.html
index 66336b903..a33fbe966 100644
--- a/wger/exercises/templates/view.html
+++ b/wger/exercises/templates/view.html
@@ -330,7 +330,7 @@ weight_log_chart({{json|safe}}, "{{svg_uuid}}", "{{reps}}")
<h3>{% trans "Back to overview" %}</h3>
<p>
- <a href="{% url 'wger.exercises.views.exercises.overview' %}">
+ <a href="{% url 'exercise-overview' %}">
<img src="{% static 'images/icons/list.svg' %}"
width="32"
height="32"
diff --git a/wger/exercises/tests/test_exercise.py b/wger/exercises/tests/test_exercise.py
index edbcc00f3..5e9353cd0 100644
--- a/wger/exercises/tests/test_exercise.py
+++ b/wger/exercises/tests/test_exercise.py
@@ -37,7 +37,7 @@ class ExerciseIndexTestCase(WorkoutManagerTestCase):
Tests the exercise overview page
'''
- response = self.client.get(reverse('wger.exercises.views.exercises.overview'))
+ response = self.client.get(reverse('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('wger.exercises.views.exercises.overview'))
+ response = self.client.get(reverse('exercise-overview'))
self.assertEqual(response.status_code, 200)
self.assertContains(response, 'No categories')
@@ -135,8 +135,7 @@ class ExerciseDetailTestCase(WorkoutManagerTestCase):
Tests the exercise details page
'''
- response = self.client.get(reverse('wger.exercises.views.exercises.view',
- kwargs={'id': 1}))
+ response = self.client.get(reverse('exercise-view', kwargs={'id': 1}))
self.assertEqual(response.status_code, 200)
# Correct tab is selected
@@ -166,8 +165,7 @@ class ExerciseDetailTestCase(WorkoutManagerTestCase):
self.assertNotContains(response, 'Exercise is pending')
# Ensure that non-existent exercises throw a 404.
- response = self.client.get(reverse('wger.exercises.views.exercises.view',
- kwargs={'id': 42}))
+ response = self.client.get(reverse('exercise-view', kwargs={'id': 42}))
self.assertEqual(response.status_code, 404)
def test_exercise_detail_editor(self):
@@ -262,8 +260,7 @@ class ExercisesTestCase(WorkoutManagerTestCase):
self.assertEqual(exercise.user, 'test')
self.assertEqual(exercise.status, Exercise.EXERCISE_STATUS_PENDING)
- response = self.client.get(reverse('wger.exercises.views.exercises.view',
- kwargs={'id': exercise_id}))
+ response = self.client.get(reverse('exercise-view', kwargs={'id': exercise_id}))
self.assertEqual(response.status_code, 200)
# Navigation tab
diff --git a/wger/exercises/tests/test_submitted_exercise.py b/wger/exercises/tests/test_submitted_exercise.py
index 902fe5948..33790c4ea 100644
--- a/wger/exercises/tests/test_submitted_exercise.py
+++ b/wger/exercises/tests/test_submitted_exercise.py
@@ -70,8 +70,7 @@ class ExercisesPendingDetailTestCase(WorkoutManagerTestCase):
'''
Helper function
'''
- response = self.client.get(reverse('wger.exercises.views.exercises.view',
- kwargs={'id': 4}))
+ response = self.client.get(reverse('exercise-view', kwargs={'id': 4}))
self.assertContains(response, 'Exercise is pending')
if not fail:
diff --git a/wger/exercises/urls.py b/wger/exercises/urls.py
index c409b680f..8c45c9f07 100644
--- a/wger/exercises/urls.py
+++ b/wger/exercises/urls.py
@@ -12,16 +12,17 @@ urlpatterns = patterns('wger.exercises.views',
# Exercises
url(r'^overview/$',
- 'exercises.overview',
+ exercises.overview,
name='exercise-overview'),
- url(r'^search/$', 'exercises.search'),
+ url(r'^search/$',
+ exercises.search),
url(r'^(?P<id>\d+)/view/$',
- 'exercises.view',
+ exercises.view,
name='exercise-view'),
url(r'^(?P<id>\d+)/view/(?P<slug>[-\w]+)/$',
- 'exercises.view',
- name='exercise-view-slug'),
+ exercises.view,
+ name='exercise-view'),
url(r'^add/$',
login_required(exercises.ExerciseAddView.as_view()),
name='exercise-add'),
diff --git a/wger/exercises/views/categories.py b/wger/exercises/views/categories.py
index 3f3babf2d..41a4de77a 100644
--- a/wger/exercises/views/categories.py
+++ b/wger/exercises/views/categories.py
@@ -46,7 +46,7 @@ class ExerciseCategoryAddView(WgerFormMixin, CreateView, WgerPermissionMixin):
'''
model = ExerciseCategory
- success_url = reverse_lazy('wger.exercises.views.exercises.overview')
+ success_url = reverse_lazy('exercise-overview')
title = ugettext_lazy('Add category')
form_action = reverse_lazy('exercisecategory-add')
messages = ugettext_lazy('Category was successfully created')
@@ -64,7 +64,7 @@ class ExerciseCategoryUpdateView(WgerFormMixin, UpdateView, WgerPermissionMixin)
'''
model = ExerciseCategory
- success_url = reverse_lazy('wger.exercises.views.exercises.overview')
+ success_url = reverse_lazy('exercise-overview')
messages = ugettext_lazy('Category successfully edited')
permission_required = 'exercises.change_exercisecategory'
@@ -88,7 +88,7 @@ class ExerciseCategoryDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixi
'''
model = ExerciseCategory
- success_url = reverse_lazy('wger.exercises.views.exercises.overview')
+ success_url = reverse_lazy('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'
diff --git a/wger/exercises/views/comments.py b/wger/exercises/views/comments.py
index 625a3f792..d281d2540 100644
--- a/wger/exercises/views/comments.py
+++ b/wger/exercises/views/comments.py
@@ -49,8 +49,7 @@ 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-view', kwargs={'id': self.object.exercise.id})
# Send some additional data to the template
def get_context_data(self, **kwargs):
@@ -75,8 +74,7 @@ class ExerciseCommentAddView(WgerFormMixin, CreateView, WgerPermissionMixin):
return super(ExerciseCommentAddView, self).form_valid(form)
def get_success_url(self):
- return reverse('wger.exercises.views.exercises.view',
- kwargs={'id': self.object.exercise.id})
+ return reverse('exercise-view', kwargs={'id': self.object.exercise.id})
def get_context_data(self, **kwargs):
'''
@@ -96,5 +94,4 @@ def delete(request, id):
exercise_id = comment.exercise.id
comment.delete()
- return HttpResponseRedirect(reverse('wger.exercises.views.exercises.view',
- kwargs={'id': exercise_id}))
+ return HttpResponseRedirect(reverse('exercise-view', kwargs={'id': exercise_id}))
diff --git a/wger/exercises/views/exercises.py b/wger/exercises/views/exercises.py
index 74fa16a05..c3bc9732b 100644
--- a/wger/exercises/views/exercises.py
+++ b/wger/exercises/views/exercises.py
@@ -254,7 +254,7 @@ class ExerciseDeleteView(WgerDeleteMixin, DeleteView):
'''
model = Exercise
- success_url = reverse_lazy('wger.exercises.views.exercises.overview')
+ success_url = reverse_lazy('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'
diff --git a/wger/exercises/views/images.py b/wger/exercises/views/images.py
index dac85184d..20ba9908b 100644
--- a/wger/exercises/views/images.py
+++ b/wger/exercises/views/images.py
@@ -48,8 +48,7 @@ class ExerciseImageEditView(WgerFormMixin, UpdateView, WgerPermissionMixin):
permission_required = 'exercises.change_exerciseimage'
def get_success_url(self):
- return reverse('wger.exercises.views.exercises.view',
- kwargs={'id': self.object.exercise.id})
+ return reverse('exercise-view', kwargs={'id': self.object.exercise.id})
# Send some additional data to the template
def get_context_data(self, **kwargs):
@@ -76,8 +75,7 @@ class ExerciseImageAddView(WgerFormMixin, CreateView, WgerPermissionMixin):
return super(ExerciseImageAddView, self).form_valid(form)
def get_success_url(self):
- return reverse('wger.exercises.views.exercises.view',
- kwargs={'id': self.object.exercise.id})
+ return reverse('exercise-view', kwargs={'id': self.object.exercise.id})
def get_context_data(self, **kwargs):
'''
@@ -105,8 +103,7 @@ class ExerciseImageDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):
'''
Return to exercise image
'''
- return reverse('exercise-view',
- kwargs={'id': self.kwargs['exercise_pk']})
+ return reverse('exercise-view', kwargs={'id': self.kwargs['exercise_pk']})
def get_context_data(self, **kwargs):
'''
diff --git a/wger/manager/pdf.py b/wger/manager/pdf.py
index ef9dd6e99..fd1ccd634 100644
--- a/wger/manager/pdf.py
+++ b/wger/manager/pdf.py
@@ -278,7 +278,7 @@ def workout_log(request, id):
# Print date and info
created = datetime.date.today().strftime("%d.%m.%Y")
- url = reverse('wger.manager.views.workout.view', kwargs={'id': workout.id})
+ url = reverse('workout-view', kwargs={'id': workout.id})
P = Paragraph('''<para align="left">
%(date)s -
<a href="%(url)s">%(url)s</a> -
diff --git a/wger/manager/templates/index.html b/wger/manager/templates/index.html
index c7b06f2fd..466e90243 100644
--- a/wger/manager/templates/index.html
+++ b/wger/manager/templates/index.html
@@ -13,7 +13,7 @@
<h3>{% trans "Workout"%}</h3>
{% if current_workout %}
<p>
- <a href="{% url 'wger.manager.views.workout.view' current_workout.id %}">
+ <a href="{% url 'workout-view' current_workout.id %}">
{% if current_workout.comment %}
{{ current_workout.comment }}
{% else %}
@@ -45,7 +45,7 @@
{% else %}
<p>
- <a href="{% url 'wger.manager.views.workout.add' %}" class="btn btn-block">
+ <a href="{% url 'workout-add' %}" class="btn btn-block">
{% trans "No workouts found." %} {% trans "Add one now." %}
</a>
</p>
@@ -60,7 +60,7 @@
{% if plan %}
<p>
- <a href="{% url 'wger.nutrition.views.plan.view' plan.id %}">
+ <a href="{% url 'nutrition-view' plan.id %}">
{% if plan.description %}
{{ plan.description }}
{% else %}
@@ -87,7 +87,7 @@
{% else %}
<p>
- <a href="{% url 'wger.nutrition.views.plan.add' %}" class="btn btn-block">
+ <a href="{% url 'nutrition-add' %}" class="btn btn-block">
{% trans "No nutrition plans." %} {% trans "Add one now." %}
</a>
</p>
@@ -105,7 +105,7 @@
<div class="ym-g50 ym-gl">
<div class="ym-gbox-left">
<p>
- <a href="{% url 'wger.manager.views.workout.add' %}">
+ <a href="{% url 'workout-add' %}">
<img src="{% static 'images/icons/new.svg' %}"
width="32"
height="32"
@@ -118,7 +118,7 @@
<div class="ym-g50 ym-gr">
<div class="ym-gbox-right">
<p>
- <a href="{% url 'wger.nutrition.views.plan.add' %}">
+ <a href="{% url 'nutrition-add' %}">
<img src="{% static 'images/icons/new.svg' %}"
width="32"
height="32"
diff --git a/wger/manager/templates/mobile/index.html b/wger/manager/templates/mobile/index.html
index fbc9da7af..1091801c2 100644
--- a/wger/manager/templates/mobile/index.html
+++ b/wger/manager/templates/mobile/index.html
@@ -17,7 +17,7 @@
{% if current_workout %}
<ul data-role="listview" data-inset="false" style="margin-bottom:1em;" data-theme="b">
<li>
- <a href="{% url 'wger.manager.views.workout.view' current_workout.id %}"
+ <a href="{% url 'workout-view' current_workout.id %}"
data-mini="true"
data-ajax="false">
@@ -56,7 +56,7 @@
{% if plan %}
<ul data-role="listview" data-inset="false" style="margin-bottom:1em;" data-theme="b">
<li>
- <a href="{% url 'wger.nutrition.views.plan.view' plan.id %}"
+ <a href="{% url 'nutrition-view' plan.id %}"
data-mini="true"
data-ajax="false">
{{ plan }}
@@ -215,7 +215,7 @@ pauses you do.{% endblocktrans %}</div>
</div>
<div class="ui-block-b">
- <a href="{% url 'wger.weight.views.overview' %}" data-role="button" data-ajax="false">
+ <a href="{% url 'weight-overview' %}" data-role="button" data-ajax="false">
<img src="{% static 'images/icons/statistics.svg' %}"
width="32"
height="32"
diff --git a/wger/manager/templates/mobile/navigation.html b/wger/manager/templates/mobile/navigation.html
index 809c366fb..bf016c4ac 100644
--- a/wger/manager/templates/mobile/navigation.html
+++ b/wger/manager/templates/mobile/navigation.html
@@ -34,7 +34,7 @@
<div data-role="collapsible" data-content-theme="d">
<h3>{% trans "Workouts" %}</h3>
<ul data-role="listview">
- <li><a href="{% url 'wger.manager.views.workout.overview' %}" rel="nofollow">{% trans "Workouts" %}</a></li>
+ <li><a href="{% url 'workout-overview' %}" rel="nofollow">{% trans "Workouts" %}</a></li>
<li><a href="{% url 'workout-calendar' %}" rel="nofollow" data-ajax="false">{% trans "Calendar" %}</a></li>
<li><a href="{% url 'schedule-overview' %}" rel="nofollow">{% trans "Workouts schedules" %}</a></li>
</ul>
@@ -66,7 +66,7 @@
<div data-role="collapsible" data-content-theme="d">
<h3>{% trans "Weight" %}</h3>
<ul data-role="listview">
- <li><a href="{% url 'wger.weight.views.overview' %}" rel="nofollow" data-ajax="false">{% trans "Weight overview" %}</a></li>
+ <li><a href="{% url 'weight-overview' %}" rel="nofollow" data-ajax="false">{% trans "Weight overview" %}</a></li>
<li><a href="{% url 'weight-add' %}" rel="nofollow" >{% trans "Add weight entry" %}</a></li>
</ul>
</div>
@@ -77,7 +77,7 @@
<div data-role="collapsible" data-content-theme="d">
<h3>{% trans "Nutrition" %}</h3>
<ul data-role="listview" data-divider-theme="a">
- <li><a href="{% url 'wger.nutrition.views.plan.overview' %}" rel="nofollow">{% trans "Nutrition plans" %}</a></li>
+ <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" data-ajax="false">{% trans "BMI calculator" %}</a></li>
<li><a href="{% url 'calories-calculator' %}" rel="nofollow" data-ajax="false">{% trans "Daily calories calculator" %}</a></li>
diff --git a/wger/manager/templates/mobile/schedule/view.html b/wger/manager/templates/mobile/schedule/view.html
index 7f38be01e..173a685ed 100644
--- a/wger/manager/templates/mobile/schedule/view.html
+++ b/wger/manager/templates/mobile/schedule/view.html
@@ -40,7 +40,7 @@
<ul data-role="listview" data-inset="false" data-split-icon="gear" data-split-theme="d">
{% for step in schedule.schedulestep_set.select_related %}
<li>
- <a href="{% url 'wger.manager.views.workout.view' step.workout.id %}">
+ <a href="{% url 'workout-view' step.workout.id %}">
<h3>{{ forloop.counter }} - {{ step.workout }}</h3>
<p>{{ workout.creation_date }}</p>
diff --git a/wger/manager/templates/mobile/template.html b/wger/manager/templates/mobile/template.html
index 4858ac675..a406f024a 100644
--- a/wger/manager/templates/mobile/template.html
+++ b/wger/manager/templates/mobile/template.html
@@ -124,10 +124,10 @@
{% if user.is_authenticated %}
<li>
- <a href="{% url 'wger.manager.views.workout.overview' %}">{% trans "Workouts" %}</a>
+ <a href="{% url 'workout-overview' %}">{% trans "Workouts" %}</a>
</li>
<li>
- <a href="{% url 'wger.nutrition.views.plan.overview' %}">{% trans "Nutrition" %}</a>
+ <a href="{% url 'nutrition-overview' %}">{% trans "Nutrition" %}</a>
</li>
{% endif %}
diff --git a/wger/manager/templates/mobile/workout/calendar.html b/wger/manager/templates/mobile/workout/calendar.html
index f814fbcbb..c81472f6e 100644
--- a/wger/manager/templates/mobile/workout/calendar.html
+++ b/wger/manager/templates/mobile/workout/calendar.html
@@ -79,7 +79,7 @@ day in your current workout:{% endblocktrans %} {{current_workout}}</p>
</ul>
{% else %}
<p><em>{% trans "No workouts found." %}</em></p>
- <a href="{% url 'wger.manager.views.workout.add' %}" data-role="button">
+ <a href="{% url 'workout-add' %}" data-role="button">
<img src="{% static 'images/icons/add.svg' %}"
width="22"
height="22"
diff --git a/wger/manager/templates/mobile/workout/overview.html b/wger/manager/templates/mobile/workout/overview.html
index 1e06afe93..c8af1ffb5 100644
--- a/wger/manager/templates/mobile/workout/overview.html
+++ b/wger/manager/templates/mobile/workout/overview.html
@@ -9,7 +9,7 @@
<ul data-role="listview" data-inset="false">
{% for workout in workouts %}
<li>
- <a href="{% url 'wger.manager.views.workout.view' workout.id %}" data-ajax="false">
+ <a href="{% url 'workout-view' workout.id %}" data-ajax="false">
<h3>{{ workout }}</h3>
<p>{{ workout.creation_date }}</p>
{% if workout == current_workout %}
@@ -19,7 +19,7 @@
</li>
{% empty %}
<li>
- <a href="{% url 'wger.manager.views.workout.add' %}">
+ <a href="{% url 'workout-add' %}">
{% trans "No workouts found." %}<br>{% trans "Add one now." %}
</a>
</li>
@@ -31,7 +31,7 @@
{% block sidebar %}
<h3>{% trans "Options" %}</h3>
<p>
- <a href="{% url 'wger.manager.views.workout.add' %}" data-role="button">
+ <a href="{% url 'workout-add' %}" data-role="button">
<img src="{% static 'images/icons/new.svg' %}"
width="32"
height="32"
diff --git a/wger/manager/templates/navigation.html b/wger/manager/templates/navigation.html
index 3a0472f00..53c5ed067 100644
--- a/wger/manager/templates/navigation.html
+++ b/wger/manager/templates/navigation.html
@@ -21,12 +21,12 @@
{# Workout tab #}
{# #}
<li class="dropdown {% if active_tab == 'workout' %}active{% endif %}">
- <a href="{% url 'wger.manager.views.workout.overview' %}"
+ <a href="{% url 'workout-overview' %}"
rel="nofollow"
class="dropdown-toggle"
data-toggle="dropdown">{% trans "Workouts" %} <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="{% url 'wger.manager.views.workout.overview' %}" rel="nofollow">{% trans "Workouts" %}</a></li>
+ <li><a href="{% url 'workout-overview' %}" rel="nofollow">{% trans "Workouts" %}</a></li>
<li><a href="{% url 'workout-calendar' %}" rel="nofollow">{% trans "Calendar" %}</a></li>
<li><a href="{% url 'schedule-overview' %}" rel="nofollow">{% trans "Workouts schedules" %}</a></li>
</ul>
@@ -37,11 +37,11 @@
{# Exercises tab #}
{# #}
<li class="dropdown {% if active_tab == 'exercises' %}active{% endif %}">
- <a href="{% url 'wger.exercises.views.exercises.overview' %}"
+ <a href="{% url 'exercise-overview' %}"
class="dropdown-toggle"
data-toggle="dropdown">{% trans "Exercises" %} <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="{% url 'wger.exercises.views.exercises.overview' %}">{% trans "Exercises" %}</a></li>
+ <li><a href="{% url 'exercise-overview' %}">{% trans "Exercises" %}</a></li>
<li><a href="{% url 'muscle-overview' %}">{% trans "Muscle 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>
@@ -64,12 +64,12 @@
{# #}
<li class="dropdown{% if active_tab == 'weight' %} active{% endif %}">
- <a href="{% url 'wger.weight.views.overview' %}"
+ <a href="{% url 'weight-overview' %}"
class="dropdown-toggle"
data-toggle="dropdown"
rel="nofollow">{% trans "Weight" %} <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="{% url 'wger.weight.views.overview' %}" rel="nofollow">{% trans "Weight overview" %}</a></li>
+ <li><a href="{% url 'weight-overview' %}" rel="nofollow">{% trans "Weight overview" %}</a></li>
<li><a href="{% url 'weight-add' %}" rel="nofollow">{% trans "Add weight entry" %}</a></li>
</ul>
</li>
@@ -79,12 +79,12 @@
{# Nutrition tab #}
{# #}
<li class="dropdown {% if active_tab == 'nutrition' %}active{% endif %}">
- <a href="{% url 'wger.nutrition.views.plan.overview' %}"
+ <a href="{% url 'nutrition-overview' %}"
class="dropdown-toggle"
data-toggle="dropdown"
rel="nofollow">{% trans "Nutrition" %} <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="{% url 'wger.nutrition.views.plan.overview' %}" rel="nofollow">{% trans "Nutrition plans" %}</a></li>
+ <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>
diff --git a/wger/manager/templates/schedule/view.html b/wger/manager/templates/schedule/view.html
index d00229f98..1f9eb9792 100644
--- a/wger/manager/templates/schedule/view.html
+++ b/wger/manager/templates/schedule/view.html
@@ -103,7 +103,7 @@ $(document).ready(function() {
</span>
</td>
<td>
- <a href="{% url 'wger.manager.views.workout.view' step.workout.id %}">{{ step.workout }}</a>
+ <a href="{% url 'workout-view' step.workout.id %}">{{ step.workout }}</a>
{% if active_workout == step %}
<span class="label label-info">{% trans "active" %}</span>
{% endif %}
diff --git a/wger/manager/templates/workout/calendar.html b/wger/manager/templates/workout/calendar.html
index 7cfdecee3..1f624c1f0 100644
--- a/wger/manager/templates/workout/calendar.html
+++ b/wger/manager/templates/workout/calendar.html
@@ -76,7 +76,7 @@ day in your current workout:{% endblocktrans %} {{current_workout}}</p>
{% else %}
<p><em>{% trans "No workouts found." %}</em></p>
<p>
- <a href="{% url 'wger.manager.views.workout.add' %}" class="btn btn-block">
+ <a href="{% url 'workout-add' %}" class="btn btn-block">
<img src="{% static 'images/icons/add.svg' %}"
width="22"
height="22"
diff --git a/wger/manager/templates/workout/overview.html b/wger/manager/templates/workout/overview.html
index 4702d1c5f..e71433c7d 100644
--- a/wger/manager/templates/workout/overview.html
+++ b/wger/manager/templates/workout/overview.html
@@ -19,7 +19,7 @@
{% for workout in workouts %}
<tr>
<td>
- <a href="{% url 'wger.manager.views.workout.view' workout.id %}">
+ <a href="{% url 'workout-view' workout.id %}">
{{ workout }}
</a>
{% if workout == current_workout %}
@@ -35,7 +35,7 @@
</table>
{% else %}
<p>
- <a href="{% url 'wger.manager.views.workout.add' %}" class="btn btn-block">
+ <a href="{% url 'workout-add' %}" class="btn btn-block">
{% trans "No workouts found." %} {% trans "Add one now." %}
</a>
</p>
@@ -48,7 +48,7 @@
{% block sidebar %}
<h3>{% trans "Options" %}</h3>
<p>
- <a href="{% url 'wger.manager.views.workout.add' %}">
+ <a href="{% url 'workout-add' %}">
<img src="{% static 'images/icons/new.svg' %}"
width="32"
height="32"
diff --git a/wger/manager/tests/test_copy_workout.py b/wger/manager/tests/test_copy_workout.py
index 1a475789f..6c18511c8 100644
--- a/wger/manager/tests/test_copy_workout.py
+++ b/wger/manager/tests/test_copy_workout.py
@@ -54,8 +54,7 @@ class CopyWorkoutTestCase(WorkoutManagerTestCase):
self.assertTemplateUsed('workout/view.html')
# Test accessing the copied workout
- response = self.client.get(reverse('wger.manager.views.workout.view',
- kwargs={'id': 4}))
+ response = self.client.get(reverse('workout-view', kwargs={'id': 4}))
if not owner:
self.assertEqual(response.status_code, 404)
diff --git a/wger/manager/tests/test_day.py b/wger/manager/tests/test_day.py
index 9347184c0..ce46fbc82 100644
--- a/wger/manager/tests/test_day.py
+++ b/wger/manager/tests/test_day.py
@@ -158,7 +158,7 @@ class WorkoutCacheTestCase(WorkoutManagerTestCase):
'''
self.user_login('admin')
- self.client.get(reverse('wger.manager.views.workout.view', kwargs={'id': 1}))
+ self.client.get(reverse('workout-view', kwargs={'id': 1}))
old_day1 = cache.get(get_template_cache_name('day-view', 1))
old_day2 = cache.get(get_template_cache_name('day-view', 2))
@@ -171,7 +171,7 @@ class WorkoutCacheTestCase(WorkoutManagerTestCase):
self.assertFalse(cache.get(get_template_cache_name('day-view', 1)))
self.assertTrue(cache.get(get_template_cache_name('day-view', 2)))
- self.client.get(reverse('wger.manager.views.workout.view', kwargs={'id': 1}))
+ self.client.get(reverse('workout-view', kwargs={'id': 1}))
new_day1 = cache.get(get_template_cache_name('day-view', 1))
new_day2 = cache.get(get_template_cache_name('day-view', 2))
self.assertNotEqual(old_day1, new_day1)
diff --git a/wger/manager/tests/test_index.py b/wger/manager/tests/test_index.py
index 463818972..0706dd365 100644
--- a/wger/manager/tests/test_index.py
+++ b/wger/manager/tests/test_index.py
@@ -53,7 +53,7 @@ class DashboardTestCase(WorkoutManagerTestCase):
#
# 1. Add a workout
#
- self.client.get(reverse('wger.manager.views.workout.add'))
+ self.client.get(reverse('workout-add'))
response = self.client.get(reverse('dashboard'))
self.assertEqual(response.status_code, 200)
@@ -65,7 +65,7 @@ class DashboardTestCase(WorkoutManagerTestCase):
#
# 2. Add a nutrition plan
#
- self.client.get(reverse('wger.nutrition.views.plan.add'))
+ self.client.get(reverse('nutrition-add'))
response = self.client.get(reverse('dashboard'))
self.assertEqual(response.status_code, 200)
diff --git a/wger/manager/tests/test_set.py b/wger/manager/tests/test_set.py
index b28ebfd5e..9bc40223a 100644
--- a/wger/manager/tests/test_set.py
+++ b/wger/manager/tests/test_set.py
@@ -300,7 +300,7 @@ class WorkoutCacheTestCase(WorkoutManagerTestCase):
'''
self.user_login('admin')
- self.client.get(reverse('wger.manager.views.workout.view', kwargs={'id': 1}))
+ self.client.get(reverse('workout-view', kwargs={'id': 1}))
# Edit a set
set1 = Set.objects.get(pk=1)
@@ -319,7 +319,7 @@ class WorkoutCacheTestCase(WorkoutManagerTestCase):
'''
self.user_login('admin')
- self.client.get(reverse('wger.manager.views.workout.view', kwargs={'id': 1}))
+ self.client.get(reverse('workout-view', kwargs={'id': 1}))
# Edit a setting
setting1 = Setting.objects.get(pk=1)
diff --git a/wger/manager/tests/test_temporary_users.py b/wger/manager/tests/test_temporary_users.py
index 133cb105b..259a49402 100644
--- a/wger/manager/tests/test_temporary_users.py
+++ b/wger/manager/tests/test_temporary_users.py
@@ -111,7 +111,7 @@ class DemoUserTestCase(WorkoutManagerTestCase):
self.client.get(reverse('software:code'))
self.assertEqual(self.count_temp_users(), 1)
- self.client.get(reverse('wger.exercises.views.exercises.overview'))
+ self.client.get(reverse('exercise-overview'))
self.assertEqual(self.count_temp_users(), 1)
self.client.get(reverse('ingredient-list'))
@@ -128,7 +128,7 @@ class DemoUserTestCase(WorkoutManagerTestCase):
# Try some other pages
self.user_logout()
- self.client.get(reverse('wger.manager.views.workout.overview'))
+ self.client.get(reverse('workout-overview'))
self.assertEqual(self.count_temp_users(), 3)
self.user_logout()
@@ -136,7 +136,7 @@ class DemoUserTestCase(WorkoutManagerTestCase):
self.assertEqual(self.count_temp_users(), 4)
self.user_logout()
- self.client.get(reverse('wger.nutrition.views.plan.overview'))
+ self.client.get(reverse('nutrition-overview'))
self.assertEqual(self.count_temp_users(), 5)
def test_demo_user_notice(self):
@@ -146,12 +146,12 @@ class DemoUserTestCase(WorkoutManagerTestCase):
demo_notice_text = 'You are using a guest account'
self.user_login('demo')
self.assertContains(self.client.get(reverse('dashboard')), demo_notice_text)
- self.assertContains(self.client.get(reverse('wger.manager.views.workout.overview')),
+ self.assertContains(self.client.get(reverse('workout-overview')),
demo_notice_text)
- self.assertContains(self.client.get(reverse('wger.exercises.views.exercises.overview')),
+ self.assertContains(self.client.get(reverse('exercise-overview')),
demo_notice_text)
self.assertContains(self.client.get(reverse('muscle-overview')), demo_notice_text)
- self.assertContains(self.client.get(reverse('wger.nutrition.views.plan.overview')),
+ self.assertContains(self.client.get(reverse('nutrition-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/manager/tests/test_workout.py b/wger/manager/tests/test_workout.py
index 12d847608..66697926b 100644
--- a/wger/manager/tests/test_workout.py
+++ b/wger/manager/tests/test_workout.py
@@ -38,7 +38,7 @@ class AddWorkoutTestCase(WorkoutManagerTestCase):
# Create a workout
count_before = Workout.objects.count()
- response = self.client.get(reverse('wger.manager.views.workout.add'))
+ response = self.client.get(reverse('workout-add'))
count_after = Workout.objects.count()
# There is always a redirect
@@ -48,8 +48,7 @@ class AddWorkoutTestCase(WorkoutManagerTestCase):
self.assertGreater(count_after, count_before)
# Test accessing workout
- response = self.client.get(reverse('wger.manager.views.workout.view',
- kwargs={'id': 1}))
+ response = self.client.get(reverse('workout-view', kwargs={'id': 1}))
workout = Workout.objects.get(pk=1)
self.assertEqual(response.context['workout'], workout)
@@ -100,7 +99,7 @@ class WorkoutOverviewTestCase(WorkoutManagerTestCase):
Helper function to test the workout overview
'''
- response = self.client.get(reverse('wger.manager.views.workout.overview'))
+ response = self.client.get(reverse('workout-overview'))
# Page exists
self.assertEqual(response.status_code, 200)
@@ -147,7 +146,7 @@ class WorkoutCacheTestCase(WorkoutManagerTestCase):
self.assertFalse(cache.get(get_template_cache_name('day-view', 1)))
self.assertFalse(cache.get(get_template_cache_name('day-view', 2)))
- self.client.get(reverse('wger.manager.views.workout.view', kwargs={'id': 1}))
+ self.client.get(reverse('workout-view', kwargs={'id': 1}))
self.assertTrue(cache.get(get_template_cache_name('day-view', 1)))
self.assertTrue(cache.get(get_template_cache_name('day-view', 2)))
diff --git a/wger/manager/views/day.py b/wger/manager/views/day.py
index d81fec1ad..010cbacd2 100644
--- a/wger/manager/views/day.py
+++ b/wger/manager/views/day.py
@@ -53,8 +53,7 @@ class DayView(WgerFormMixin):
form_class = DayForm
def get_success_url(self):
- return reverse('wger.manager.views.workout.view',
- kwargs={'id': self.object.training_id})
+ return reverse('workout-view', kwargs={'id': self.object.training_id})
def get_form(self, form_class):
'''
@@ -127,8 +126,7 @@ def delete(request, id, day_id):
# Check if the user is the owner of the object
if day.training.user == request.user:
day.delete()
- return HttpResponseRedirect(reverse('wger.manager.views.workout.view',
- kwargs={'id': id}))
+ return HttpResponseRedirect(reverse('workout-view', kwargs={'id': id}))
else:
return HttpResponseForbidden()
diff --git a/wger/manager/views/set.py b/wger/manager/views/set.py
index 6d6b72722..802acd05c 100644
--- a/wger/manager/views/set.py
+++ b/wger/manager/views/set.py
@@ -113,7 +113,7 @@ def create(request, day_pk):
instance.exercise = formset['exercise']
instance.save()
- return HttpResponseRedirect(reverse('wger.manager.views.workout.view',
+ return HttpResponseRedirect(reverse('workout-view',
kwargs={'id': day.get_owner_object().id}))
else:
logger.debug(form.errors)
@@ -161,7 +161,7 @@ def delete(request, pk):
# Check if the user is the owner of the object
if set_obj.get_owner_object().user == request.user:
set_obj.delete()
- return HttpResponseRedirect(reverse('wger.manager.views.workout.view',
+ return HttpResponseRedirect(reverse('workout-view',
kwargs={'id': set_obj.get_owner_object().id}))
else:
return HttpResponseForbidden()
@@ -215,7 +215,7 @@ def edit(request, pk):
instance.exercise = formset['exercise']
instance.save()
- return HttpResponseRedirect(reverse('wger.manager.views.workout.view',
+ return HttpResponseRedirect(reverse('workout-view',
kwargs={'id': set_obj.get_owner_object().id}))
# Other context we need
diff --git a/wger/manager/views/workout.py b/wger/manager/views/workout.py
index 6ecf187cb..23305944b 100644
--- a/wger/manager/views/workout.py
+++ b/wger/manager/views/workout.py
@@ -178,7 +178,7 @@ def copy_workout(request, pk):
setting_copy.set = current_set_copy
setting_copy.save()
- return HttpResponseRedirect(reverse('wger.manager.views.workout.view',
+ return HttpResponseRedirect(reverse('workout-view',
kwargs={'id': workout.id}))
else:
workout_form = WorkoutCopyForm({'comment': workout.comment})
@@ -205,8 +205,7 @@ def add(request):
workout.user = request.user
workout.save()
- return HttpResponseRedirect(reverse('wger.manager.views.workout.view',
- kwargs={'id': workout.id}))
+ return HttpResponseRedirect(reverse('workout-view', kwargs={'id': workout.id}))
class WorkoutDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):
@@ -215,7 +214,7 @@ class WorkoutDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):
'''
model = Workout
- success_url = reverse_lazy('wger.manager.views.workout.overview')
+ success_url = reverse_lazy('workout-overview')
title = ugettext_lazy('Delete workout')
form_action_urlname = 'workout-delete'
messages = ugettext_lazy('Workout was successfully deleted')
diff --git a/wger/nutrition/models.py b/wger/nutrition/models.py
index e28aeeaf5..08d9d9df4 100644
--- a/wger/nutrition/models.py
+++ b/wger/nutrition/models.py
@@ -87,7 +87,7 @@ class NutritionPlan(models.Model):
'''
Returns the canonical URL to view this object
'''
- return reverse('wger.nutrition.views.plan.view', kwargs={'id': self.id})
+ return reverse('nutrition-view', kwargs={'id': self.id})
def get_nutritional_values(self):
'''
@@ -257,8 +257,7 @@ class Ingredient(models.Model):
'''
Returns the canonical URL to view this object
'''
- return reverse('wger.nutrition.views.ingredient.view',
- kwargs={'id': self.id, 'slug': slugify(self.name)})
+ return reverse('ingredient-view', kwargs={'id': self.id, 'slug': slugify(self.name)})
def clean(self):
'''
diff --git a/wger/nutrition/templates/ingredient/search.html b/wger/nutrition/templates/ingredient/search.html
index 519c113bf..8c01ded25 100644
--- a/wger/nutrition/templates/ingredient/search.html
+++ b/wger/nutrition/templates/ingredient/search.html
@@ -24,7 +24,7 @@
<ul>
{% for ingredient in ingredients %}
- <li><a href="{% url 'wger.nutrition.views.ingredient.view' ingredient.id %}">{{ ingredient.name }}</a></li>
+ <li><a href="{% url 'ingredient-view' ingredient.id %}">{{ ingredient.name }}</a></li>
{% endfor %}
</ul>
diff --git a/wger/nutrition/templates/mobile/plan/overview.html b/wger/nutrition/templates/mobile/plan/overview.html
index 4afe08d64..bdd39571b 100644
--- a/wger/nutrition/templates/mobile/plan/overview.html
+++ b/wger/nutrition/templates/mobile/plan/overview.html
@@ -10,14 +10,14 @@
<ul data-role="listview" data-inset="false">
{% for plan in plans %}
<li>
- <a href="{% url 'wger.nutrition.views.plan.view' plan.id %}" data-ajax="false">
+ <a href="{% url 'nutrition-view' plan.id %}" data-ajax="false">
<h3>{{plan}}</h3>
<p>{{ plan.creation_date }}</p>
</a>
</li>
{% empty %}
<li>
- <a href="{% url 'wger.nutrition.views.plan.add' %}">
+ <a href="{% url 'nutrition-add' %}">
{% trans "No nutrition plans." %}<br> {% trans "Add one now." %}
</a>
</li>
@@ -30,7 +30,7 @@
{% block sidebar%}
<h3>{% trans "Options" %}</h3>
<p>
- <a href="{% url 'wger.nutrition.views.plan.add' %}" id="nutrition-create-new" data-role="button">
+ <a href="{% url 'nutrition-add' %}" id="nutrition-create-new" data-role="button">
<img src="{% static 'images/icons/new.svg' %}"
width="32"
height="32"
diff --git a/wger/nutrition/templates/plan/overview.html b/wger/nutrition/templates/plan/overview.html
index 9f4685229..b00fd2773 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 'wger.nutrition.views.plan.view' plan.id %}">
+ <a href="{% url 'nutrition-view' plan.id %}">
{% if plan.description %}
{{ plan.description }}
{% else %}
@@ -36,7 +36,7 @@
</table>
{% else %}
<p>
- <a href="{% url 'wger.nutrition.views.plan.add' %}" class="btn btn-block">
+ <a href="{% url 'nutrition-add' %}" class="btn btn-block">
{% trans "No nutrition plans." %} {% trans "Add one now." %}
</a>
</p>
@@ -49,7 +49,7 @@
{% block sidebar%}
<h3>{% trans "Options" %}</h3>
<p>
- <a href="{% url 'wger.nutrition.views.plan.add' %}" id="nutrition-create-new">
+ <a href="{% url 'nutrition-add' %}" id="nutrition-create-new">
<img src="{% static 'images/icons/new.svg' %}"
width="32"
height="32"
diff --git a/wger/nutrition/tests/test_copy_plan.py b/wger/nutrition/tests/test_copy_plan.py
index 3317485a3..22ff03ca8 100644
--- a/wger/nutrition/tests/test_copy_plan.py
+++ b/wger/nutrition/tests/test_copy_plan.py
@@ -49,7 +49,7 @@ class CopyPlanTestCase(WorkoutManagerTestCase):
self.assertEqual(count_after, 7)
# Test accessing the copied workout
- response = self.client.get(reverse('wger.nutrition.views.plan.view', kwargs={'id': 4}))
+ response = self.client.get(reverse('nutrition-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 1e4a45a33..23786f1e8 100644
--- a/wger/nutrition/tests/test_ingredient.py
+++ b/wger/nutrition/tests/test_ingredient.py
@@ -111,8 +111,7 @@ class IngredientDetailTestCase(WorkoutManagerTestCase):
Tests the ingredient details page
'''
- response = self.client.get(reverse('wger.nutrition.views.ingredient.view',
- kwargs={'id': 6}))
+ response = self.client.get(reverse('ingredient-view', kwargs={'id': 6}))
self.assertEqual(response.status_code, 200)
# Correct tab is selected
@@ -130,8 +129,7 @@ class IngredientDetailTestCase(WorkoutManagerTestCase):
self.assertNotContains(response, 'pending review')
# Non-existent ingredients throw a 404.
- response = self.client.get(reverse('wger.nutrition.views.ingredient.view',
- kwargs={'id': 42}))
+ response = self.client.get(reverse('ingredient-view', kwargs={'id': 42}))
self.assertEqual(response.status_code, 404)
def test_ingredient_detail_editor(self):
diff --git a/wger/nutrition/tests/test_meal.py b/wger/nutrition/tests/test_meal.py
index 3bbb93171..104f91fe8 100644
--- a/wger/nutrition/tests/test_meal.py
+++ b/wger/nutrition/tests/test_meal.py
@@ -60,7 +60,7 @@ class PlanOverviewTestCase(WorkoutManagerTestCase):
Helper function to test the nutrition plan overview
'''
- response = self.client.get(reverse('wger.nutrition.views.plan.overview'))
+ response = self.client.get(reverse('nutrition-overview'))
# Page exists
self.assertEqual(response.status_code, 200)
@@ -84,7 +84,7 @@ class PlanDetailTestCase(WorkoutManagerTestCase):
Helper function to test the plan detail view
'''
- response = self.client.get(reverse('wger.nutrition.views.plan.view', kwargs={'id': 1}))
+ response = self.client.get(reverse('nutrition-view', kwargs={'id': 1}))
# Page exists
if fail:
diff --git a/wger/nutrition/tests/test_submitted_ingredient.py b/wger/nutrition/tests/test_submitted_ingredient.py
index 11c04c81a..853f49330 100644
--- a/wger/nutrition/tests/test_submitted_ingredient.py
+++ b/wger/nutrition/tests/test_submitted_ingredient.py
@@ -69,8 +69,7 @@ class IngredientsPendingDetailTestCase(WorkoutManagerTestCase):
'''
Helper function
'''
- response = self.client.get(reverse('wger.nutrition.views.ingredient.view',
- kwargs={'id': 7}))
+ response = self.client.get(reverse('ingredient-view', kwargs={'id': 7}))
self.assertContains(response, 'pending review')
if not fail:
diff --git a/wger/nutrition/urls.py b/wger/nutrition/urls.py
index 8541cedd9..403f9b231 100644
--- a/wger/nutrition/urls.py
+++ b/wger/nutrition/urls.py
@@ -2,6 +2,8 @@ from django.conf.urls import patterns, url
from django.contrib.auth.decorators import login_required
from wger.nutrition.views import ingredient
+from wger.nutrition.views import bmi
+from wger.nutrition.views import calculator
from wger.nutrition.views import plan
from wger.nutrition.views import meal
from wger.nutrition.views import meal_item
@@ -17,10 +19,10 @@ urlpatterns = patterns('wger.nutrition.views',
plan.add,
name='nutrition-add'),
url(r'^(?P<id>\d+)/view/$',
- 'plan.view',
+ plan.view,
name='nutrition-view'),
url(r'^(?P<pk>\d+)/copy/$',
- 'plan.copy',
+ plan.copy,
name='nutrition-copy'),
url(r'^(?P<pk>\d+)/delete/$',
login_required(plan.PlanDeleteView.as_view()),
@@ -28,7 +30,8 @@ urlpatterns = patterns('wger.nutrition.views',
url(r'^(?P<pk>\d+)/edit/$',
login_required(plan.PlanEditView.as_view()),
name='nutrition-edit'),
- url(r'^(?P<id>\d+)/pdf/$', 'plan.export_pdf'),
+ url(r'^(?P<id>\d+)/pdf/$',
+ plan.export_pdf),
# Meals
url(r'^(?P<plan_pk>\d+)/meal/add/$',
@@ -65,23 +68,25 @@ urlpatterns = patterns('wger.nutrition.views',
ingredient.PendingIngredientListView.as_view(),
name='ingredient-pending'),
url(r'^(?P<pk>\d+)/accept/$',
- 'ingredient.accept',
+ ingredient.accept,
name='ingredient-accept'),
url(r'^(?P<pk>\d+)/decline/$',
- 'ingredient.decline',
+ ingredient.decline,
name='ingredient-decline'),
url(r'^ingredient/(?P<id>\d+)/view/$',
- 'ingredient.view',
+ ingredient.view,
+ name='ingredient-view'),
+ url(r'^ingredient/(?P<id>\d+)/view/(?P<slug>[-\w]+)/$',
+ ingredient.view,
name='ingredient-view'),
- url(r'^ingredient/(?P<id>\d+)/view/(?P<slug>[-\w]+)/$', 'ingredient.view'),
url(r'^ingredient/search/$',
- 'ingredient.search',
+ ingredient.search,
name='ingredient-search'),
url(r'^ingredient/(?P<pk>\d+)/get-units$',
- 'ingredient.ajax_get_ingredient_units',
+ ingredient.ajax_get_ingredient_units,
name='ingredient-get-units'),
url(r'^ingredient/(?P<pk>\d+)/get-nutritional-values$',
- 'ingredient.ajax_get_ingredient_values',
+ ingredient.ajax_get_ingredient_values,
name='ingredient-get-values'),
# Ingredient units
@@ -98,7 +103,6 @@ urlpatterns = patterns('wger.nutrition.views',
unit.WeightUnitUpdateView.as_view(),
name='weight-unit-edit'),
-
# Ingredient to weight units cross table
url(r'^ingredient/unit-to-ingredient/add/(?P<ingredient_pk>\d+)/$',
unit_ingredient.WeightUnitIngredientCreateView.as_view(),
@@ -112,28 +116,26 @@ urlpatterns = patterns('wger.nutrition.views',
# BMI
url(r'^calculator/bmi$',
- 'bmi.view',
+ bmi.view,
name='bmi-view'),
url(r'^calculator/bmi/calculate$',
- 'bmi.calculate',
+ bmi.calculate,
name='bmi-calculate'),
url(r'^calculator/bmi/chart-data$',
- 'bmi.chart_data',
+ bmi.chart_data,
name='bmi-chart-data'), # JS
# Calories calculator
url(r'^calculator/calories$',
- 'calculator.view',
+ calculator.view,
name='calories-calculator'),
url(r'^calculator/calories/bmr$',
- 'calculator.calculate_bmr',
+ calculator.calculate_bmr,
name='calories-calculate-bmr'),
url(r'^calculator/calories/activities$',
- 'calculator.calculate_activities',
+ calculator.calculate_activities,
name='calories-calculate-activities'), # JS
url(r'^calculator/calories/total$',
- 'calculator.update_total',
+ calculator.update_total,
name='calories-calculate-total'), # JS
-
-
)
diff --git a/wger/nutrition/views/meal.py b/wger/nutrition/views/meal.py
index 46ccd2d6b..574ec3728 100644
--- a/wger/nutrition/views/meal.py
+++ b/wger/nutrition/views/meal.py
@@ -53,7 +53,7 @@ class MealCreateView(WgerFormMixin, CreateView):
return super(MealCreateView, self).form_valid(form)
def get_success_url(self):
- return reverse('wger.nutrition.views.plan.view', kwargs={'id': self.object.plan.id})
+ return reverse('nutrition-view', kwargs={'id': self.object.plan.id})
# Send some additional data to the template
def get_context_data(self, **kwargs):
@@ -74,7 +74,7 @@ class MealEditView(WgerFormMixin, UpdateView):
form_action_urlname = 'meal-edit'
def get_success_url(self):
- return reverse('wger.nutrition.views.plan.view', kwargs={'id': self.object.plan.id})
+ return reverse('nutrition-view', kwargs={'id': self.object.plan.id})
@login_required
@@ -90,7 +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('wger.nutrition.views.plan.view',
- kwargs={'id': plan.id}))
+ return HttpResponseRedirect(reverse('nutrition-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 960c2cb13..412fd9072 100644
--- a/wger/nutrition/views/meal_item.py
+++ b/wger/nutrition/views/meal_item.py
@@ -81,8 +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('wger.nutrition.views.plan.view',
- kwargs={'id': plan.id}))
+ return HttpResponseRedirect(reverse('nutrition-view', kwargs={'id': plan.id}))
else:
return HttpResponseForbidden()
@@ -108,7 +107,7 @@ class MealItemCreateView(WgerFormMixin, CreateView):
return HttpResponseForbidden()
def get_success_url(self):
- return reverse('wger.nutrition.views.plan.view', kwargs={'id': self.meal.plan.id})
+ return reverse('nutrition-view', kwargs={'id': self.meal.plan.id})
def get_context_data(self, **kwargs):
'''
@@ -141,7 +140,7 @@ class MealItemEditView(WgerFormMixin, UpdateView):
template_name = 'meal_item/edit.html'
def get_success_url(self):
- return reverse('wger.nutrition.views.plan.view', kwargs={'id': self.object.meal.plan.id})
+ return reverse('nutrition-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 cd431549c..b98d64581 100644
--- a/wger/nutrition/views/plan.py
+++ b/wger/nutrition/views/plan.py
@@ -78,7 +78,7 @@ def add(request):
plan.language = load_language()
plan.save()
- return HttpResponseRedirect(reverse('wger.nutrition.views.plan.view', kwargs={'id': plan.id}))
+ return HttpResponseRedirect(reverse('nutrition-view', kwargs={'id': plan.id}))
class PlanDeleteView(WgerDeleteMixin, DeleteView):
@@ -87,7 +87,7 @@ class PlanDeleteView(WgerDeleteMixin, DeleteView):
'''
model = NutritionPlan
- success_url = reverse_lazy('wger.nutrition.views.plan.overview')
+ success_url = reverse_lazy('nutrition-overview')
title = ugettext_lazy('Delete nutritional plan?')
form_action_urlname = 'nutrition-delete'
messages = ugettext_lazy('Nutritional plan was successfully deleted')
@@ -160,7 +160,7 @@ def copy(request, pk):
item.save()
# Redirect
- return HttpResponseRedirect(reverse('wger.nutrition.views.plan.view', kwargs={'id': plan.id}))
+ return HttpResponseRedirect(reverse('nutrition-view', kwargs={'id': plan.id}))
@login_required
@@ -282,7 +282,7 @@ def export_pdf(request, id):
# Print date and info
created = datetime.date.today().strftime("%d.%m.%Y")
- url = reverse('wger.nutrition.views.plan.view', kwargs={'id': plan.id})
+ url = reverse('nutrition-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_ingredient.py b/wger/nutrition/views/unit_ingredient.py
index fade90ab4..ed48a30d0 100644
--- a/wger/nutrition/views/unit_ingredient.py
+++ b/wger/nutrition/views/unit_ingredient.py
@@ -60,8 +60,7 @@ class WeightUnitIngredientCreateView(WgerFormMixin, CreateView, WgerPermissionMi
return context
def get_success_url(self):
- return reverse('wger.nutrition.views.ingredient.view',
- kwargs={'id': self.kwargs['ingredient_pk']})
+ return reverse('ingredient-view', kwargs={'id': self.kwargs['ingredient_pk']})
def form_valid(self, form):
ingredient = get_object_or_404(Ingredient, pk=self.kwargs['ingredient_pk'])
@@ -93,8 +92,7 @@ class WeightUnitIngredientUpdateView(WgerFormMixin, UpdateView, WgerPermissionMi
permission_required = 'nutrition.add_ingredientweightunit'
def get_success_url(self):
- return reverse('wger.nutrition.views.ingredient.view',
- kwargs={'id': self.object.ingredient.id})
+ return reverse('ingredient-view', kwargs={'id': self.object.ingredient.id})
def get_form_class(self):
'''
@@ -121,5 +119,4 @@ class WeightUnitIngredientDeleteView(WgerDeleteMixin, DeleteView, WgerPermission
permission_required = 'nutrition.add_ingredientweightunit'
def get_success_url(self):
- return reverse('wger.nutrition.views.ingredient.view',
- kwargs={'id': self.object.ingredient.id})
+ return reverse('ingredient-view', kwargs={'id': self.object.ingredient.id})
diff --git a/wger/weight/views.py b/wger/weight/views.py
index ce2de308d..749f3291d 100644
--- a/wger/weight/views.py
+++ b/wger/weight/views.py
@@ -76,7 +76,7 @@ class WeightAddView(WgerFormMixin, CreateView):
});'''
title = ugettext_lazy('Add weight entry')
form_action = reverse_lazy('weight-add')
- success_url = reverse_lazy('wger.weight.views.overview')
+ success_url = reverse_lazy('weight-overview')
def get_initial(self):
'''
@@ -105,7 +105,7 @@ class WeightUpdateView(WgerFormMixin, UpdateView):
custom_js = '''$(document).ready(function () {
init_weight_datepicker();
});'''
- success_url = reverse_lazy('wger.weight.views.overview')
+ success_url = reverse_lazy('weight-overview')
def get_context_data(self, **kwargs):
context = super(WeightUpdateView, self).get_context_data(**kwargs)