Self hosted FLOSS fitness/workout, nutrition and weight tracker
Make get_absolute_url more intelligent if the slug is empty
Roland Geider57987dda07bb
diff --git a/wger/exercises/models/exercise.py b/wger/exercises/models/exercise.pyindex bf80d8631..d822cefc4 100644--- a/wger/exercises/models/exercise.py+++ b/wger/exercises/models/exercise.py@@ -116,12 +116,14 @@ class Exercise(AbstractLicenseModel, AbstractHistoryMixin, models.Model):"""Returns the canonical URL to view an exercise"""+ slug_name = slugify(self.name)+ kwargs = {'pk': self.exercise_base_id}+ if slug_name:+ kwargs['slug'] = slug_name+return reverse('exercise:exercise:view-base',- kwargs={- 'pk': self.exercise_base_id,- 'slug': slugify(self.name)- }+ kwargs=kwargs)def save(self, *args, **kwargs):diff --git a/wger/exercises/tests/test_exercise_model.py b/wger/exercises/tests/test_exercise_model.pynew file mode 100644index 000000000..947027633--- /dev/null+++ b/wger/exercises/tests/test_exercise_model.py@@ -0,0 +1,38 @@+# This file is part of wger Workout Manager.+#+# wger Workout Manager is free software: you can redistribute it and/or modify+# it under the terms of the GNU Affero General Public License as published by+# the Free Software Foundation, either version 3 of the License, or+# (at your option) any later version.+#+# wger Workout Manager is distributed in the hope that it will be useful,+# but WITHOUT ANY WARRANTY; without even the implied warranty of+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+# GNU General Public License for more details.+#+# You should have received a copy of the GNU Affero General Public License++# wger+from wger.core.tests.base_testcase import WgerTestCase+from wger.exercises.models import Exercise+++class ExerciseModelTestCase(WgerTestCase):+ """+ Test the logic in the exercise model+ """++ def test_absolute_url_name(self):+ """Test that the get_absolute_url returns the correct URL"""+ exercise = Exercise(exercise_base_id=1, description='abc', name='foo')+ self.assertEqual(exercise.get_absolute_url(), '/en/exercise/1/view-base/foo')++ def test_absolute_url_no_name(self):+ """Test that the get_absolute_url returns the correct URL"""+ exercise = Exercise(exercise_base_id=2, description='abc', name='')+ self.assertEqual(exercise.get_absolute_url(), '/en/exercise/2/view-base')++ def test_absolute_url_no_name2(self):+ """Test that the get_absolute_url returns the correct URL"""+ exercise = Exercise(exercise_base_id=42, description='abc', name='@@@@@')+ self.assertEqual(exercise.get_absolute_url(), '/en/exercise/42/view-base')