Self hosted FLOSS fitness/workout, nutrition and weight tracker
Also reset the exercises overview cache when editing categories
Roland Geider3ad7ca227592
diff --git a/wger/exercises/models.py b/wger/exercises/models.pyindex 8d29f0b6d..06b59c7fd 100644--- a/wger/exercises/models.py+++ b/wger/exercises/models.py@@ -122,6 +122,30 @@ class ExerciseCategory(models.Model):'''return False+ def save(self, *args, **kwargs):+ '''+ Reset all cached infos+ '''++ super(ExerciseCategory, self).save(*args, **kwargs)++ # Cached template fragments+ for language in Language.objects.all():+ delete_template_fragment_cache('exercise-overview', language.id)+ delete_template_fragment_cache('exercise-overview-mobile', language.id)+ delete_template_fragment_cache('exercise-overview-search', language.id)++ def delete(self, *args, **kwargs):+ '''+ Reset all cached infos+ '''+ for language in Language.objects.all():+ delete_template_fragment_cache('exercise-overview', language.id)+ delete_template_fragment_cache('exercise-overview-mobile', language.id)+ delete_template_fragment_cache('exercise-overview-search', language.id)++ super(ExerciseCategory, self).delete(*args, **kwargs)+class Exercise(AbstractLicenseModel, models.Model):'''diff --git a/wger/exercises/tests/test_categories.py b/wger/exercises/tests/test_categories.pyindex 3ad62ac92..ef8531c2e 100644--- a/wger/exercises/tests/test_categories.py+++ b/wger/exercises/tests/test_categories.py@@ -12,9 +12,14 @@## You should have received a copy of the GNU Affero General Public License+from django.core.cache import cache+from django.core.urlresolvers import reversefrom wger.exercises.models import ExerciseCategory+from wger.utils.cache import get_template_cache_name+from wger.manager.tests.testcase import WorkoutManagerDeleteTestCase+from wger.manager.tests.testcase import WorkoutManagerTestCasefrom wger.manager.tests.testcase import WorkoutManagerEditTestCasefrom wger.manager.tests.testcase import WorkoutManagerAddTestCasefrom wger.manager.tests.testcase import ApiBaseResourceTestCase@@ -54,6 +59,51 @@ class AddExerciseCategoryTestCase(WorkoutManagerAddTestCase):data = {'name': 'A new category'}+class ExerciseCategoryCacheTestCase(WorkoutManagerTestCase):+ '''+ Cache test case+ '''++ def test_overview_cache_update(self):+ '''+ Test that the template cache for the overview is correctly reseted when+ performing certain operations+ '''++ self.client.get(reverse('exercise-overview'))+ self.client.get(reverse('exercise-view', kwargs={'id': 2}))++ old_exercise_overview = cache.get(get_template_cache_name('exercise-overview', 2))+ old_exercise_overview_mobile = cache.get(get_template_cache_name('exercise-overview-mobile',+ 2))+ old_exercise_overview_search = cache.get(get_template_cache_name('exercise-overview-search',+ 2))++ category = ExerciseCategory.objects.get(pk=2)+ category.name = 'Cool category'+ category.save()++ self.assertFalse(cache.get(get_template_cache_name('exercise-overview', 2)))+ self.assertFalse(cache.get(get_template_cache_name('exercise-overview-mobile', 2)))+ self.assertFalse(cache.get(get_template_cache_name('exercise-overview-search', 2)))++ self.client.get(reverse('exercise-overview'))+ self.client.get(reverse('muscle-overview'))+ self.client.get(reverse('exercise-view', kwargs={'id': 2}))++ new_exercise_overview = cache.get(get_template_cache_name('exercise-overview', 2))+ new_exercise_overview_mobile = cache.get(get_template_cache_name('exercise-overview-mobile',+ 2))+ new_exercise_overview_search = cache.get(get_template_cache_name('exercise-overview-search',+ 2))++ if not self.is_mobile:+ self.assertNotEqual(old_exercise_overview, new_exercise_overview)+ else:+ self.assertNotEqual(old_exercise_overview_mobile, new_exercise_overview_mobile)+ self.assertNotEqual(old_exercise_overview_search, new_exercise_overview_search)++class ExerciseCategoryApiTestCase(ApiBaseResourceTestCase):'''Tests the exercise category overview resourcediff --git a/wger/exercises/views/categories.py b/wger/exercises/views/categories.pyindex 41a4de77a..8fdd7fac5 100644--- a/wger/exercises/views/categories.py+++ b/wger/exercises/views/categories.py@@ -54,7 +54,6 @@ class ExerciseCategoryAddView(WgerFormMixin, CreateView, WgerPermissionMixin):def form_valid(self, form):form.instance.language = load_language()-return super(ExerciseCategoryAddView, self).form_valid(form)diff --git a/wger/manager/management/commands/email-reminders.py b/wger/manager/management/commands/email-reminders.pyindex 4557b389f..7bfb3bb1c 100644--- a/wger/manager/management/commands/email-reminders.py+++ b/wger/manager/management/commands/email-reminders.py@@ -20,7 +20,6 @@ from django.template import loaderfrom django.core.management.base import BaseCommandfrom django.core import mailfrom django.utils.translation import ugettext_lazy as _-from django.conf import settingsfrom django.utils import translationfrom django.contrib.sites.models import Site