Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Use the get_absolute_url method to render URLs

Roland Geider2f1073a1a6f4
diff --git a/wger/core/templates/index.html b/wger/core/templates/index.html
index a45b0c9ac..cecadd0e4 100644
--- a/wger/core/templates/index.html
+++ b/wger/core/templates/index.html
@@ -52,7 +52,7 @@ day in your current workout:{% endblocktrans %} <strong>{{current_workout}}</str
{% if current_workout %}
<p>
- <a href="{% url 'manager:workout:view' current_workout.id %}">
+ <a href="{{ current_workout.get_absolute_url }}">
{% if current_workout.comment %}
{{ current_workout.comment }}
{% else %}
diff --git a/wger/core/templates/mobile/index.html b/wger/core/templates/mobile/index.html
index 27f833a41..bd5f45719 100644
--- a/wger/core/templates/mobile/index.html
+++ b/wger/core/templates/mobile/index.html
@@ -14,7 +14,7 @@
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title">{% trans "Current workout" %}</h4>
{% if current_workout %}
- <h5><a href="{% url 'manager:workout:view' current_workout.id %}">{{ current_workout }}</a></h5>
+ <h5><a href="{{ current_workout.get_absolute_url }}">{{ current_workout }}</a></h5>
{% endif %}
</div>
<div class="modal-body">
diff --git a/wger/core/templates/user/overview.html b/wger/core/templates/user/overview.html
index 111254e4f..945f3559d 100644
--- a/wger/core/templates/user/overview.html
+++ b/wger/core/templates/user/overview.html
@@ -36,7 +36,7 @@
{{workout.workout.creation_date}}
</td>
<td>
- <a href="{{trainer_login}}?next={% url 'manager:workout:view' workout.workout.pk %}">{{workout.workout}}</a>
+ <a href="{{trainer_login}}?next={{ workout.workout.get_absolute_url }}">{{workout.workout}}</a>
</td>
<td>
{{workout.logs|default:'-/-'}}
diff --git a/wger/manager/models.py b/wger/manager/models.py
index 7a435e338..d627d0ac3 100644
--- a/wger/manager/models.py
+++ b/wger/manager/models.py
@@ -65,7 +65,7 @@ class Workout(models.Model):
'''
Returns the canonical URL to view a workout
'''
- return reverse('manager:workout:view', kwargs={'id': self.id})
+ return reverse('manager:workout:view', kwargs={'pk': self.id})
def __unicode__(self):
'''
diff --git a/wger/manager/pdf.py b/wger/manager/pdf.py
index 38a70fa5c..7e9236185 100644
--- a/wger/manager/pdf.py
+++ b/wger/manager/pdf.py
@@ -94,8 +94,7 @@ def workout_log(request, id, uidb64=None, token=None):
# Footer, date and info
elements.append(Spacer(10*cm, 0.5*cm))
- url = reverse('manager:workout:view', kwargs={'id': workout.id})
- elements.append(render_footer(request.build_absolute_uri(url)))
+ elements.append(render_footer(request.build_absolute_uri(workout.get_absolute_url())))
# write the document and send the response to the browser
doc.build(elements)
@@ -286,7 +285,6 @@ def workout_view(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('manager:workout:view', kwargs={'id': workout.id})
p = Paragraph('''<para align="left">
%(date)s -
<a href="%(url)s">%(url)s</a> -
@@ -296,7 +294,7 @@ def workout_view(request, id, uidb64=None, token=None):
{'date': _("Created on the <b>%s</b>") % created,
'created': "wger Workout Manager",
'version': get_version(),
- 'url': request.build_absolute_uri(url), },
+ 'url': request.build_absolute_uri(workout.get_absolute_url()), },
styleSheet["Normal"])
elements.append(p)
diff --git a/wger/manager/templates/day/log.html b/wger/manager/templates/day/log.html
index c252fd3a7..2484f2ced 100644
--- a/wger/manager/templates/day/log.html
+++ b/wger/manager/templates/day/log.html
@@ -65,7 +65,7 @@ $(document).ready(function () {
{% empty %}
{% trans "Add exercises to this training day before adding a log." %}
<br>
- <a href="{% url 'manager:workout:view' day.training.id %}">{% trans "Back to workout" %}</a>
+ <a href="{{ day.training.get_absolute_url }}">{% trans "Back to workout" %}</a>
{% endfor %}
</div>
@@ -84,7 +84,7 @@ will simply be edited. Weight entries are always added.{% endblocktrans %}</p>
<h3>{% trans "Options" %}</h3>
<p>
-<a href="{% url 'manager:workout:view' day.training.id %}" {% auto_link_css flavour %}>
+<a href="{{ day.training.get_absolute_url }}" {% auto_link_css flavour %}>
<img src="{% static 'images/icons/list.svg' %}"
width="32"
height="32"
diff --git a/wger/manager/templates/mobile/schedule/view.html b/wger/manager/templates/mobile/schedule/view.html
index aaee0691d..57992274d 100644
--- a/wger/manager/templates/mobile/schedule/view.html
+++ b/wger/manager/templates/mobile/schedule/view.html
@@ -16,7 +16,7 @@
<h4 class="modal-title">{%trans "Options" %}</h4>
</div>
<div class="modal-body">
- <a href="{% url 'manager:workout:view' step.workout.id %}"
+ <a href="{{ step.workout.get_absolute_url }}"
title="{% trans 'Workout' %}"
class="btn btn-default btn-block">
{% trans 'Workout' %}</a>
diff --git a/wger/manager/templates/mobile/workout/overview.html b/wger/manager/templates/mobile/workout/overview.html
index 773919aad..349d81383 100644
--- a/wger/manager/templates/mobile/workout/overview.html
+++ b/wger/manager/templates/mobile/workout/overview.html
@@ -9,7 +9,7 @@
{% block content %}
<div class="list-group">
{% for workout in workouts %}
- <a href="{% url 'manager:workout:view' workout.id %}" class="list-group-item wger-list-group-item">
+ <a href="{{ workout.get_abolute_url }} class="list-group-item wger-list-group-item">
<span class="glyphicon glyphicon-chevron-right pull-right"></span>
{% if workout == current_workout %}
diff --git a/wger/manager/templates/schedule/view.html b/wger/manager/templates/schedule/view.html
index 030d9cdb0..91a3eaef0 100644
--- a/wger/manager/templates/schedule/view.html
+++ b/wger/manager/templates/schedule/view.html
@@ -122,7 +122,7 @@ $(function() {
</span>
</td>
<td>
- <a href="{% url 'manager:workout:view' step.workout.id %}">{{ step.workout }}</a>
+ <a href="{{ step.workout.get_absolute_url }}">{{ step.workout }}</a>
{% if active_workout == step %}
<span class="label label-info">{% trans "active" %}</span>
{% endif %}
@@ -182,7 +182,7 @@ $(function() {
<span>{{step_dates.0}} <br> {{step_dates.1}}</span>
</div>
<div class="panel-footer">
- <a href="{% url 'manager:workout:view' step.workout.id %}"
+ <a href="{{ step.workout.get_absolute_url }}"
class="btn btn-default btn-block btn-sm"
style="white-space: normal;">
<span class="glyphicon glyphicon-chevron-right pull-right"></span>
@@ -194,7 +194,7 @@ $(function() {
<div class="col-md-9">
{% for day in step.workout.canonical_representation.day_list %}
<div id="div-day-{{ day.obj.id }}">
- {% render_day day.obj flavour True %}
+ {% render_day day.obj False %}
</div>
{% endfor %}
</div>
diff --git a/wger/manager/templates/workout/log.html b/wger/manager/templates/workout/log.html
index 1ab3e55ef..6cc4a985f 100644
--- a/wger/manager/templates/workout/log.html
+++ b/wger/manager/templates/workout/log.html
@@ -82,7 +82,7 @@ $(document).ready(function() {
{% block sidebar %}
<h3>{% trans "Options" %}</h3>
<p>
-<a href="{% url 'manager:workout:view' workout.id %}" {% auto_link_css flavour %}>
+<a href="{{ workout.get_absolute_url }}" {% auto_link_css flavour %}>
<img src="{% static 'images/icons/list.svg' %}"
width="32"
height="32"
diff --git a/wger/manager/templates/workout/overview.html b/wger/manager/templates/workout/overview.html
index 0a1d3757b..bb81c5bc7 100644
--- a/wger/manager/templates/workout/overview.html
+++ b/wger/manager/templates/workout/overview.html
@@ -18,7 +18,7 @@
{% for workout in workouts %}
<tr>
<td>
- <a href="{% url 'manager:workout:view' workout.id %}">
+ <a href="{{ workout.get_absolute_url }}">
{{ workout }}
</a>
{% if workout == current_workout %}
diff --git a/wger/manager/tests/test_copy_workout.py b/wger/manager/tests/test_copy_workout.py
index c77435078..4ecf31d97 100644
--- a/wger/manager/tests/test_copy_workout.py
+++ b/wger/manager/tests/test_copy_workout.py
@@ -54,7 +54,7 @@ class CopyWorkoutTestCase(WorkoutManagerTestCase):
self.assertTemplateUsed('workout/view.html')
# Test accessing the copied workout
- response = self.client.get(reverse('manager:workout:view', kwargs={'id': 4}))
+ response = self.client.get(reverse('manager:workout:view', kwargs={'pk': 4}))
if not owner:
self.assertEqual(response.status_code, 404)
diff --git a/wger/manager/tests/test_weight_log.py b/wger/manager/tests/test_weight_log.py
index 2fd4489dd..7206c1b79 100644
--- a/wger/manager/tests/test_weight_log.py
+++ b/wger/manager/tests/test_weight_log.py
@@ -303,7 +303,7 @@ class WorkoutLogCacheTestCase(WorkoutManagerTestCase):
for cache_key in ('workout-log-full', 'workout-log-mobile'):
self.assertFalse(cache.get(get_template_cache_name(cache_key, True, 1, 2012, 10)))
self.assertFalse(cache.get(get_template_cache_name(cache_key, False, 1, 2012, 10)))
- self.client.get(reverse('manager:workout:calendar', kwargs={'user_pk': 1,
+ self.client.get(reverse('manager:workout:calendar', kwargs={'uidb64': make_uid(1),
'year': 2012,
'month': 10}))
diff --git a/wger/manager/tests/test_workout.py b/wger/manager/tests/test_workout.py
index 27c17c54c..b237b1198 100644
--- a/wger/manager/tests/test_workout.py
+++ b/wger/manager/tests/test_workout.py
@@ -45,7 +45,7 @@ class AddWorkoutTestCase(WorkoutManagerTestCase):
self.assertGreater(count_after, count_before)
# Test accessing workout
- response = self.client.get(reverse('manager:workout:view', kwargs={'id': 1}))
+ response = self.client.get(reverse('manager:workout:view', kwargs={'pk': 1}))
workout = Workout.objects.get(pk=1)
self.assertEqual(response.context['workout'], workout)
diff --git a/wger/manager/urls.py b/wger/manager/urls.py
index 084e3a26a..b074a1d4d 100644
--- a/wger/manager/urls.py
+++ b/wger/manager/urls.py
@@ -62,7 +62,7 @@ patterns_workout = patterns('',
url(r'^(?P<pk>\d+)/delete/$',
workout.WorkoutDeleteView.as_view(),
name='delete'),
- url(r'^(?P<id>\d+)/view/$',
+ url(r'^(?P<pk>\d+)/view/$',
workout.view,
name='view'),
url(r'^calendar/(?P<uidb64>[0-9A-Za-z_\-]+)$',
diff --git a/wger/manager/views/day.py b/wger/manager/views/day.py
index 264f3f8a5..0558fc4f1 100644
--- a/wger/manager/views/day.py
+++ b/wger/manager/views/day.py
@@ -49,7 +49,7 @@ class DayView(WgerFormMixin):
form_class = DayForm
def get_success_url(self):
- return reverse('manager:workout:view', kwargs={'id': self.object.training_id})
+ return reverse('manager:workout:view', kwargs={'pk': self.object.training_id})
def get_form(self, form_class):
'''
@@ -122,7 +122,7 @@ def delete(request, pk):
'''
day = get_object_or_404(Day, training__user=request.user, pk=pk)
day.delete()
- return HttpResponseRedirect(reverse('manager:workout:view', kwargs={'id': day.training_id}))
+ return HttpResponseRedirect(reverse('manager:workout:view', kwargs={'pk': day.training_id}))
@login_required
diff --git a/wger/manager/views/set.py b/wger/manager/views/set.py
index 3283d618e..d0c51eccf 100644
--- a/wger/manager/views/set.py
+++ b/wger/manager/views/set.py
@@ -111,7 +111,7 @@ def create(request, day_pk):
instance.save()
return HttpResponseRedirect(reverse('manager:workout:view',
- kwargs={'id': day.get_owner_object().id}))
+ kwargs={'pk': day.get_owner_object().id}))
else:
logger.debug(form.errors)
@@ -158,7 +158,7 @@ def delete(request, pk):
if set_obj.get_owner_object().user == request.user:
set_obj.delete()
return HttpResponseRedirect(reverse('manager:workout:view',
- kwargs={'id': set_obj.get_owner_object().id}))
+ kwargs={'pk': set_obj.get_owner_object().id}))
else:
return HttpResponseForbidden()
@@ -213,7 +213,7 @@ def edit(request, pk):
instance.save()
return HttpResponseRedirect(reverse('manager:workout:view',
- kwargs={'id': set_obj.get_owner_object().id}))
+ kwargs={'pk': set_obj.get_owner_object().id}))
# Other context we need
context = {}
diff --git a/wger/manager/views/workout.py b/wger/manager/views/workout.py
index 171ac9b2c..df8b94992 100644
--- a/wger/manager/views/workout.py
+++ b/wger/manager/views/workout.py
@@ -67,13 +67,13 @@ def overview(request):
@login_required
-def view(request, id):
+def view(request, pk):
'''
Show the workout with the given ID
'''
template_data = {}
user = request.user
- workout = get_object_or_404(Workout, pk=id, user=user)
+ workout = get_object_or_404(Workout, pk=pk, user=user)
canonical = workout.canonical_representation
uid, token = make_token(user)
@@ -161,7 +161,7 @@ def copy_workout(request, pk):
setting_copy.save()
return HttpResponseRedirect(reverse('manager:workout:view',
- kwargs={'id': workout.id}))
+ kwargs={'pk': workout.id}))
else:
workout_form = WorkoutCopyForm({'comment': workout.comment})
@@ -186,7 +186,7 @@ def add(request):
workout.user = request.user
workout.save()
- return HttpResponseRedirect(reverse('manager:workout:view', kwargs={'id': workout.id}))
+ return HttpResponseRedirect(workout.get_absolute_url())
class WorkoutDeleteView(WgerDeleteMixin, DeleteView):