Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Small changes to log URLs

Roland Geider0e51d88bef27
diff --git a/wger/exercises/static/js/exercises.js b/wger/exercises/static/js/exercises.js
index b73808830..334b5fc93 100644
--- a/wger/exercises/static/js/exercises.js
+++ b/wger/exercises/static/js/exercises.js
@@ -182,7 +182,7 @@ function weight_log_chart(data, div_id, reps_i18n, width_factor) {
.attr("cx", line.x())
.attr("cy", line.y())
.attr("id", function(d) { return d.log_id; })
- .attr("href", function(d) { return '/' + get_current_language() + '/workout/log/edit-entry/' + d.log_id.match(/\d+/); })
+ .attr("href", function(d) { return '/' + get_current_language() + '/workout/log/' + d.log_id.match(/\d+/) + '/edit'; })
.attr("r", 5)
.style("stroke", function(d) {
return color(color_name);
diff --git a/wger/manager/urls.py b/wger/manager/urls.py
index bdc5dc594..4d5408441 100644
--- a/wger/manager/urls.py
+++ b/wger/manager/urls.py
@@ -30,16 +30,16 @@ from wger.manager import pdf
# sub patterns for workout logs
patterns_log = patterns('',
- url(r'^(?P<pk>\d+)/log/$',
+ url(r'^(?P<pk>\d+)/view$',
log.WorkoutLogDetailView.as_view(),
name='log'),
- url(r'^edit-entry/(?P<pk>\d+)$',
+ url(r'^(?P<pk>\d+)/edit$', # JS
log.WorkoutLogUpdateView.as_view(),
name='edit'),
- url(r'^delete-entry/(?P<pk>\d+)$',
+ url(r'^(?P<pk>\d+)/delete$',
log.WorkoutLogDeleteView.as_view(),
name='delete'),
- url(r'^(?P<workout_pk>\d+)/log/add$',
+ url(r'^(?P<workout_pk>\d+)/add$', # not used?
log.WorkoutLogAddView.as_view(),
name='add'),
)