Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Fix merge conflicts

Roland Geider25ea56cda262
diff --git a/wger/exercises/urls.py b/wger/exercises/urls.py
index d9c49a29a..1cf1a993d 100644
--- a/wger/exercises/urls.py
+++ b/wger/exercises/urls.py
@@ -30,7 +30,6 @@ from wger.exercises.views import (
equipment,
exercises,
history,
- images,
muscles,
)
@@ -65,35 +64,6 @@ patterns_muscle = [
),
]
-# sub patterns for exercise images
-patterns_images = [
- path(
- '<int:exercise_pk>/image/add',
- images.ExerciseImageAddView.as_view(),
- name='add',
- ),
- path(
- '<int:pk>/edit',
- images.ExerciseImageEditView.as_view(),
- name='edit',
- ),
- path(
- '<int:exercise_pk>/image/<int:pk>/delete',
- images.ExerciseImageDeleteView.as_view(),
- name='delete',
- ),
- path(
- '<int:pk>/accept/',
- images.accept,
- name='accept',
- ),
- path(
- '<int:pk>/decline/',
- images.decline,
- name='decline',
- ),
-]
-
# sub patterns for exercise comments
patterns_comment = [
@@ -193,7 +163,6 @@ patterns_exercise = [
urlpatterns = [
path('muscle/', include((patterns_muscle, 'muscle'), namespace="muscle")),
- path('image/', include((patterns_images, 'image'), namespace="image")),
path('comment/', include((patterns_comment, 'comment'), namespace="comment")),
path('category/', include((patterns_category, 'category'), namespace="category")),
path('equipment/', include((patterns_equipment, 'equipment'), namespace="equipment")),