Self hosted FLOSS fitness/workout, nutrition and weight tracker
Remove the old "view-base" URLs
Roland Geidere902087541e8
diff --git a/wger/exercises/models/base.py b/wger/exercises/models/base.pyindex 7e2f5f12d..6996a0de0 100644--- a/wger/exercises/models/base.py+++ b/wger/exercises/models/base.py@@ -143,7 +143,7 @@ class Exercise(AbstractLicenseModel, AbstractHistoryMixin, models.Model):"""Returns the canonical URL to view an exercise"""- return reverse('exercise:exercise:view-base', kwargs={'pk': self.id})+ return reverse('exercise:exercise:view', kwargs={'pk': self.id})@classmethoddef check(cls, **kwargs):diff --git a/wger/exercises/models/translation.py b/wger/exercises/models/translation.pyindex f2eaaa7d2..fc133d9c4 100644--- a/wger/exercises/models/translation.py+++ b/wger/exercises/models/translation.py@@ -115,7 +115,7 @@ class Translation(AbstractLicenseModel, AbstractHistoryMixin, models.Model):if slug_name:kwargs['slug'] = slug_name- return reverse('exercise:exercise:view-base', kwargs=kwargs)+ return reverse('exercise:exercise:view', kwargs=kwargs)def save(self, *args, **kwargs):"""diff --git a/wger/exercises/tests/test_translation_model.py b/wger/exercises/tests/test_translation_model.pyindex 69a5a629f..602c7d40b 100644--- a/wger/exercises/tests/test_translation_model.py+++ b/wger/exercises/tests/test_translation_model.py@@ -25,14 +25,14 @@ class TranslationModelTestCase(WgerTestCase):def test_absolute_url_name(self):"""Test that the get_absolute_url returns the correct URL"""translation = Translation(exercise_id=1, description='abc', name='foo')- self.assertEqual(translation.get_absolute_url(), '/en/exercise/1/view-base/foo')+ self.assertEqual(translation.get_absolute_url(), '/en/exercise/1/view/foo')def test_absolute_url_no_name(self):"""Test that the get_absolute_url returns the correct URL"""translation = Translation(exercise_id=2, description='abc', name='')- self.assertEqual(translation.get_absolute_url(), '/en/exercise/2/view-base')+ self.assertEqual(translation.get_absolute_url(), '/en/exercise/2/view')def test_absolute_url_no_name2(self):"""Test that the get_absolute_url returns the correct URL"""translation = Translation(exercise_id=42, description='abc', name='@@@@@')- self.assertEqual(translation.get_absolute_url(), '/en/exercise/42/view-base')+ self.assertEqual(translation.get_absolute_url(), '/en/exercise/42/view')diff --git a/wger/exercises/urls.py b/wger/exercises/urls.pyindex adf43c113..f5f5e929b 100644--- a/wger/exercises/urls.py+++ b/wger/exercises/urls.py@@ -122,19 +122,14 @@ patterns_exercise = [name='overview',),path(- '<int:id>/view/',+ '<int:pk>/view/',ReactView.as_view(),name='view',),path(- '<int:pk>/view-base',+ '<int:pk>/view/<slug:slug>',ReactView.as_view(),- name='view-base',- ),- path(- '<int:pk>/view-base/<slug:slug>',- ReactView.as_view(),- name='view-base',+ name='view',),path('contribute',