Self hosted FLOSS fitness/workout, nutrition and weight tracker
Remove exercise overviews
Roland Geider25e6f92962a8
diff --git a/wger/config/models/language_config.py b/wger/config/models/language_config.pyindex e41784447..a1d692f77 100644--- a/wger/config/models/language_config.py+++ b/wger/config/models/language_config.py@@ -83,7 +83,6 @@ class LanguageConfig(models.Model):cache.delete(cache_mapper.get_language_config_key(self.language, self.item))# Cached template fragments- delete_template_fragment_cache('muscle-overview', self.language_id)delete_template_fragment_cache('exercise-overview', self.language_id)def delete(self, *args, **kwargs):@@ -95,7 +94,6 @@ class LanguageConfig(models.Model):cache.delete(cache_mapper.get_language_config_key(self.language, self.item))# Cached template fragments- delete_template_fragment_cache('muscle-overview', self.language_id)delete_template_fragment_cache('exercise-overview', self.language_id)super(LanguageConfig, self).delete(*args, **kwargs)diff --git a/wger/core/management/commands/clear-cache.py b/wger/core/management/commands/clear-cache.pyindex 0dc4b01b8..c847d16d6 100644--- a/wger/core/management/commands/clear-cache.py+++ b/wger/core/management/commands/clear-cache.py@@ -108,9 +108,7 @@ class Command(BaseCommand):reset_workout_log(user.id, entry.year, entry.month, day)for language in Language.objects.all():- delete_template_fragment_cache('muscle-overview', language.id)delete_template_fragment_cache('exercise-overview', language.id)- delete_template_fragment_cache('equipment-overview', language.id)# Workout canonical formif options['clear_workout']:diff --git a/wger/core/templates/navigation.html b/wger/core/templates/navigation.htmlindex df19ba4f9..e5f508467 100644--- a/wger/core/templates/navigation.html+++ b/wger/core/templates/navigation.html@@ -62,8 +62,6 @@<li class="dropdown-divider"></li><li class="dropdown-header">{% translate "Exercises" %}</li><li><a class="dropdown-item" href="{% url 'exercise:exercise:overview' %}">{% translate "by category" context "as in sorted by category" %}</a></li>- <li><a class="dropdown-item" href="{% url 'exercise:muscle:overview' %}">{% translate "by muscle" context "as in sorted by muscle" %}</a></li>- <li><a class="dropdown-item" href="{% url 'exercise:equipment:overview' %}">{% translate "by equipment" context "as in sorted by equipment" %}</a></li>{% if user.userprofile.has_exercise_permission %}<li class="dropdown-divider"></li>diff --git a/wger/core/tests/test_temporary_users.py b/wger/core/tests/test_temporary_users.pyindex 587c5cf64..80cac567b 100644--- a/wger/core/tests/test_temporary_users.py+++ b/wger/core/tests/test_temporary_users.py@@ -172,7 +172,6 @@ class DemoUserTestCase(WgerTestCase):self.assertContains(self.client.get(reverse('exercise:exercise:overview')), demo_notice_text)- self.assertContains(self.client.get(reverse('exercise:muscle:overview')), demo_notice_text)self.assertContains(self.client.get(reverse('nutrition:plan:overview')), demo_notice_text)self.assertContains(self.client.get(reverse('software:about-us')), demo_notice_text)diff --git a/wger/exercises/models/exercise.py b/wger/exercises/models/exercise.pyindex 2fd389c06..dcfc96d25 100644--- a/wger/exercises/models/exercise.py+++ b/wger/exercises/models/exercise.py@@ -126,9 +126,7 @@ class Exercise(AbstractLicenseModel, AbstractHistoryMixin, models.Model):# Cached template fragmentsfor language in Language.objects.all():- delete_template_fragment_cache('muscle-overview', language.id)delete_template_fragment_cache('exercise-overview', language.id)- delete_template_fragment_cache('equipment-overview', language.id)# Cached workoutsfor setting in self.exercise_base.setting_set.all():@@ -141,9 +139,7 @@ class Exercise(AbstractLicenseModel, AbstractHistoryMixin, models.Model):# Cached template fragmentsfor language in Language.objects.all():- delete_template_fragment_cache('muscle-overview', language.id)delete_template_fragment_cache('exercise-overview', language.id)- delete_template_fragment_cache('equipment-overview', language.id)# Cached workoutsfor setting in self.exercise_base.setting_set.all():diff --git a/wger/exercises/models/image.py b/wger/exercises/models/image.pyindex e072d10f7..63468fee5 100644--- a/wger/exercises/models/image.py+++ b/wger/exercises/models/image.py@@ -131,10 +131,7 @@ class ExerciseImage(AbstractSubmissionModel, AbstractLicenseModel, models.Model)# Reset all cached infos#for language in Language.objects.all():- delete_template_fragment_cache('muscle-overview', language.id)delete_template_fragment_cache('exercise-overview', language.id)- delete_template_fragment_cache('exercise-overview-mobile', language.id)- delete_template_fragment_cache('equipment-overview', language.id)# And go onsuper(ExerciseImage, self).save(*args, **kwargs)@@ -146,10 +143,7 @@ class ExerciseImage(AbstractSubmissionModel, AbstractLicenseModel, models.Model)super(ExerciseImage, self).delete(*args, **kwargs)for language in Language.objects.all():- delete_template_fragment_cache('muscle-overview', language.id)delete_template_fragment_cache('exercise-overview', language.id)- delete_template_fragment_cache('exercise-overview-mobile', language.id)- delete_template_fragment_cache('equipment-overview', language.id)# Make sure there is always a main imageif not ExerciseImage.objects.accepted().filter(diff --git a/wger/exercises/templates/equipment/overview.html b/wger/exercises/templates/equipment/overview.htmldeleted file mode 100644index 0aaea935e..000000000--- a/wger/exercises/templates/equipment/overview.html+++ /dev/null@@ -1,105 +0,0 @@-{% extends "base.html" %}-{% load i18n %}-{% load static %}-{% load wger_extras %}-{% load cache %}-{% load thumbnail %}--<!--- Title--->-{% block title %}{% translate "Equipment overview" %}{% endblock %}---{% block header %}- <script>-$(function() {- // Init the autocompleter- $('#exercise-search').autocomplete({- showNoSuggestionNotice: true,- serviceUrl: '{% url 'exercise-search' %}',- onSelect: function (suggestion) {- window.location.href = '/exercise/' + suggestion.data.id + '/view/'- },- groupBy: 'category',- paramName: 'term'- });-});-</script>-{% endblock %}---<!--- Main Content--->-{% block content %}-{% cache cache_timeout equipment-overview language.id %}-<div class="accordion" id="equipmentAccordion">- {% for equipment in equipment_list %}- <div class="card">- <div class="card-header" id="header-{{equipment.pk}}">- <button class="btn btn-block text-left" type="button" data-toggle="collapse" data-target="#collapse-{{equipment.pk}}" aria-expanded="true" aria-controls="collapse-{{equipment.pk}}">- {% translate equipment.name %}- </button>- </div>- <div class="collapse" id="collapse-{{equipment.pk}}" data-parent="#equipmentAccordion">- <div class="card-body px-0">- <div class="list-group list-group-flush">- {% for base in equipment.exercisebase_set.all %}- {% with base.get_exercise as exercise %}- <a href="{{ exercise.get_absolute_url }}" class="list-group-item">- <div class="media">- {% if exercise.main_image %}- <img alt="{{ exercise.name }}"- class="mr-3"- style="width: 50px;"- src="{{ exercise.main_image.image|thumbnail_url:'thumbnail' }}">- {% else %}- <img alt="{% translate 'Placeholder image for exercise' %}"- class="mr-3"- style="width: 50px;"- src="{% static 'images/icons/image-placeholder.svg' %}">- {% endif %}- <div class="media-body">- <p class="media-heading h5">{{ exercise.name }}</p>- <span class="text-muted small">- {% translate exercise_base.category.name %}- <!--- {% translate "Main muscles" %}: {{ exercise.exercise_base.muscles.all|join:", " }}- <br>- {% translate "Secondary muscles" %}: {{ exercise.exercise_base.muscles_secondary.all|join:", " }}- -->- </span>- </div>- </div>- </a>- {% endwith %}- {% empty %}- {% translate "No exercises for this equipment. Add or edit an exercise and set the equipment." %}- {% endfor %}- </div>- </div>- </div>- </div>- {% endfor %}-</div>-{% endcache %}-{% endblock %}---<!--- Side bar--->-{% block sidebar %}-<h4>{% translate "Search" %}</h4>- <input name="term"- type="search"- id="exercise-search"- class="ajax-form-element form-control"- placeholder="{% translate 'exercise name' %}"- style="width:100%;">-{% endblock %}---{% block options %}-{% endblock %}diff --git a/wger/exercises/templates/muscles/overview.html b/wger/exercises/templates/muscles/overview.htmldeleted file mode 100644index c8c835d9f..000000000--- a/wger/exercises/templates/muscles/overview.html+++ /dev/null@@ -1,110 +0,0 @@-{% extends "base.html" %}-{% load i18n static cache wger_extras compress thumbnail %}--<!--- Title--->-{% block title %}{% translate "Muscle overview" %}{% endblock %}---{% block header %}-{% compress js %}-<script src="{% static 'js/exercises.js' %}"></script>-{% endcompress %}--{% endblock %}---<!--- Main Content--->-{% block content %}-{% cache cache_timeout muscle-overview language.id %}-<div class="accordion" id="muscleAccordion">- {% for entry in muscle_list %}- {% for muscle in entry %}- <div class="card">- <div class="card-header" id="header-{{muscle.pk}}">- <button- class="btn btn-block text-left muscle"- type="button"- data-toggle="collapse"- aria-expanded="true"- aria-controls="collapse-{{muscle.pk}}"- data-target="#collapse-{{muscle.pk}}"- data-muscle-target="muscle-{{muscle.id}}"- data-is-front="{{muscle.is_front}}"- data-name="{{muscle.name}}"- itemscope itemtype="http://schema.org/Muscle"- >- {% if muscle.name_en %}- {{ muscle }} ({% translate muscle.name_en %})- {% else %}- {{ muscle }}- {% endif %}- </button>- </div>- <div class="collapse" id="collapse-{{muscle.pk}}" data-parent="#muscleAccordion">- <div class="card-body px-0">- <div class="list-group list-group-flush">- <div class="list-group-item">- {% render_muscles muscle %}- </div>-- {% for exercise_base in muscle.exercisebase_set.all %}- {% with exercise_base.get_exercise as exercise %}- {% if exercise.language in active_languages %}- <a href="{{ exercise.get_absolute_url }}" class="list-group-item">- <div class="media">- {% if exercise.main_image %}- <img alt="{{ exercise.name }}"- class="mr-3"- style="width: 50px;"- src="{{ exercise.main_image.image|thumbnail_url:'thumbnail' }}">- {% else %}- <img alt="{% translate 'Placeholder image for exercise' %}"- class="mr-3"- style="width: 50px;"- src="{% static 'images/icons/image-placeholder.svg' %}">- {% endif %}- <div class="media-body">- <p class="media-heading h5">{{ exercise.name }}</p>- <span class="text-muted small">- {% translate exercise.category.name %}- <!--- {% translate "Main muscles" %}: {{ exercise.exercise_base.muscles.all|join:", " }}- <br>- {% translate "Secondary muscles" %}: {{ exercise.exercise_base.muscles_secondary.all|join:", " }}- -->- </span>- </div>- </div>- </a>- {% endif %}- {% endwith %}- {% empty %}- {% translate "No exercises for this muscle. Add or edit an exercise and set the muscle." %}- {% endfor %}- </div>- </div>- </div>- </div>- {% endfor %}- {% endfor %}-</div>-{% endcache %}-{% endblock %}---<!--- Side bar--->-{% block sidebar %}-{% endblock %}---<!--- Options--->-{% block options %}-{% endblock %}diff --git a/wger/exercises/tests/test_categories.py b/wger/exercises/tests/test_categories.pyindex c4ea2e678..9fbe36822 100644--- a/wger/exercises/tests/test_categories.py+++ b/wger/exercises/tests/test_categories.py@@ -119,7 +119,6 @@ class ExerciseCategoryCacheTestCase(WgerTestCase):self.assertFalse(cache.get(make_template_fragment_key('exercise-overview', [2])))self.client.get(reverse('exercise:exercise:overview'))- self.client.get(reverse('exercise:muscle:overview'))self.client.get(reverse('exercise:exercise:view', kwargs={'id': 2}))new_exercise_overview = cache.get(make_template_fragment_key('exercise-overview', [2]))diff --git a/wger/exercises/tests/test_equipment.py b/wger/exercises/tests/test_equipment.pyindex 19db358c7..daa993152 100644--- a/wger/exercises/tests/test_equipment.py+++ b/wger/exercises/tests/test_equipment.py@@ -45,26 +45,6 @@ class EquipmentRepresentationTestCase(WgerTestCase):self.assertEqual("{0}".format(Equipment.objects.get(pk=1)), 'Dumbbells')-class EquipmentShareButtonTestCase(WgerTestCase):- """- Test that the share button is correctly displayed and hidden- """-- def test_share_button(self):- url = reverse('exercise:equipment:overview')-- response = self.client.get(url)- self.assertTrue(response.context['show_shariff'])-- self.user_login('admin')- response = self.client.get(url)- self.assertTrue(response.context['show_shariff'])-- self.user_login('test')- response = self.client.get(url)- self.assertTrue(response.context['show_shariff'])--class AddEquipmentTestCase(WgerAddTestCase):"""Tests adding a new equipment@@ -135,46 +115,6 @@ class EquipmentListTestCase(WgerTestCase):self.assertEqual(response.status_code, 404)-class EquipmentCacheTestCase(WgerTestCase):- """- Equipment cache test case- """-- def test_equipment_overview(self):- """- Test the equipment overview cache is correctly generated on visit- """- self.assertFalse(cache.get(make_template_fragment_key('equipment-overview', [2])))- self.client.get(reverse('exercise:equipment:overview'))- self.assertTrue(cache.get(make_template_fragment_key('equipment-overview', [2])))-- def test_equipment_cache_update(self):- """- Test that the template cache for the overview is correctly reseted when- performing certain operations- """-- self.assertFalse(cache.get(make_template_fragment_key('equipment-overview', [2])))-- self.client.get(reverse('exercise:equipment:overview'))-- old_overview = cache.get(make_template_fragment_key('equipment-overview', [2]))- self.assertTrue(old_overview)-- exercise = Exercise.objects.get(pk=2)- exercise.name = 'Very cool exercise 2'- exercise.description = 'New description'- exercise.exercise_base.equipment.add(Equipment.objects.get(pk=2))- exercise.save()-- self.assertFalse(cache.get(make_template_fragment_key('equipment-overview', [2])))- self.client.get(reverse('exercise:equipment:overview'))-- new_overview = cache.get(make_template_fragment_key('equipment-overview', [2]))-- self.assertNotEqual(old_overview, new_overview)--class EquipmentApiTestCase(api_base_test.ApiBaseResourceTestCase):"""Tests the equipment overview resourcediff --git a/wger/exercises/tests/test_exercise_translation.py b/wger/exercises/tests/test_exercise_translation.pyindex 267b68422..91806e50f 100644--- a/wger/exercises/tests/test_exercise_translation.py+++ b/wger/exercises/tests/test_exercise_translation.py@@ -312,14 +312,12 @@ class ExercisesCacheTestCase(WgerTestCase):Test that the template cache for the overview is correctly reseted whenperforming certain operations"""- self.assertFalse(cache.get(make_template_fragment_key('muscle-overview', [2])))self.assertFalse(cache.get(make_template_fragment_key('muscle-overview-search', [2])))self.assertFalse(cache.get(make_template_fragment_key('exercise-overview', [2])))self.client.get(reverse('exercise:exercise:overview'))self.client.get(reverse('exercise:exercise:view', kwargs={'id': 2}))- old_muscle_overview = cache.get(make_template_fragment_key('muscle-overview', [2]))old_exercise_overview = cache.get(make_template_fragment_key('exercise-overview', [2]))exercise = Exercise.objects.get(pk=2)@@ -328,18 +326,14 @@ class ExercisesCacheTestCase(WgerTestCase):exercise.exercise_base.muscles_secondary.add(Muscle.objects.get(pk=2))exercise.save()- self.assertFalse(cache.get(make_template_fragment_key('muscle-overview', [2])))self.assertFalse(cache.get(make_template_fragment_key('exercise-overview', [2])))self.client.get(reverse('exercise:exercise:overview'))- self.client.get(reverse('exercise:muscle:overview'))self.client.get(reverse('exercise:exercise:view', kwargs={'id': 2}))- new_muscle_overview = cache.get(make_template_fragment_key('muscle-overview', [2]))new_exercise_overview = cache.get(make_template_fragment_key('exercise-overview', [2]))self.assertNotEqual(old_exercise_overview, new_exercise_overview)- self.assertNotEqual(old_muscle_overview, new_muscle_overview)def test_muscles_cache_update_on_delete(self):"""diff --git a/wger/exercises/tests/test_muscles.py b/wger/exercises/tests/test_muscles.pyindex 2b29e0fe0..d9b4db9de 100644--- a/wger/exercises/tests/test_muscles.py+++ b/wger/exercises/tests/test_muscles.py@@ -70,26 +70,6 @@ class MuscleAdminOverviewTest(WgerAccessTestCase):)-class MusclesShareButtonTestCase(WgerTestCase):- """- Test that the share button is correctly displayed and hidden- """-- def test_share_button(self):- url = reverse('exercise:muscle:overview')-- response = self.client.get(url)- self.assertTrue(response.context['show_shariff'])-- self.user_login('admin')- response = self.client.get(url)- self.assertTrue(response.context['show_shariff'])-- self.user_login('test')- response = self.client.get(url)- self.assertTrue(response.context['show_shariff'])--class AddMuscleTestCase(WgerAddTestCase):"""Tests adding a muscle@@ -121,30 +101,6 @@ class DeleteMuscleTestCase(WgerDeleteTestCase):pk = 1-class MuscleCacheTestCase(WgerTestCase):- """- Muscle cache test case- """-- def test_overview(self):- """- Test the muscle overview cache is correctly generated on visit- """-- self.assertFalse(cache.get(make_template_fragment_key('muscle-overview', [2])))- self.client.get(reverse('exercise:muscle:overview'))- self.assertTrue(cache.get(make_template_fragment_key('muscle-overview', [2])))---class MuscleOverviewTestCase(WgerAccessTestCase):- """- Test that only admins see the edit links- """- url = 'exercise:muscle:overview'- anonymous_fail = False- user_fail = []--class MuscleApiTestCase(api_base_test.ApiBaseResourceTestCase):"""Tests the muscle overview resourcediff --git a/wger/exercises/urls.py b/wger/exercises/urls.pyindex bcab54bda..e2f13e69e 100644--- a/wger/exercises/urls.py+++ b/wger/exercises/urls.py@@ -44,11 +44,6 @@ patterns_history = [# sub patterns for musclespatterns_muscle = [- path(- 'overview/',- muscles.MuscleListView.as_view(),- name='overview',- ),path('admin-overview/',muscles.MuscleAdminListView.as_view(),@@ -184,11 +179,6 @@ patterns_equipment = [equipment.EquipmentDeleteView.as_view(),name='delete',),- path(- 'overview',- equipment.EquipmentOverviewView.as_view(),- name='overview',- ),]# sub patterns for exercisesdiff --git a/wger/exercises/views/equipment.py b/wger/exercises/views/equipment.pyindex 90e86e8a6..0949576d6 100644--- a/wger/exercises/views/equipment.py+++ b/wger/exercises/views/equipment.py@@ -119,24 +119,3 @@ class EquipmentDeleteView(WgerDeleteMixin, LoginRequiredMixin, PermissionRequirecontext['form_action'] = reverse('exercise:equipment:delete', kwargs={'pk': pk})return context---class EquipmentOverviewView(ListView):- """- Overview with all exercises, group by equipment- """-- model = Equipment- template_name = 'equipment/overview.html'- context_object_name = 'equipment_list'-- def get_context_data(self, **kwargs):- """- Send some additional data to the template- """- context = super(EquipmentOverviewView, self).get_context_data(**kwargs)- for equipment in context['equipment_list']:- equipment.name = _(equipment.name)- context['equipment_list'] = sorted(context['equipment_list'], key=lambda e: e.name)- context['show_shariff'] = True- return contextdiff --git a/wger/exercises/views/muscles.py b/wger/exercises/views/muscles.pyindex db818820c..9f8bc1a1e 100644--- a/wger/exercises/views/muscles.py+++ b/wger/exercises/views/muscles.py@@ -47,29 +47,12 @@ from wger.utils.language import load_item_languageslogger = logging.getLogger(__name__)-class MuscleListView(ListView):+class MuscleAdminListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):"""- Overview of all muscles and their exercises+ Overview of all muscles, for administration purposes"""model = Muscle- queryset = Muscle.objects.all().order_by('-is_front', 'name'),context_object_name = 'muscle_list'- template_name = 'muscles/overview.html'-- def get_context_data(self, **kwargs):- """- Send some additional data to the template- """- context = super(MuscleListView, self).get_context_data(**kwargs)- context['active_languages'] = load_item_languages(LanguageConfig.SHOW_ITEM_EXERCISES)- context['show_shariff'] = True- return context---class MuscleAdminListView(LoginRequiredMixin, PermissionRequiredMixin, MuscleListView):- """- Overview of all muscles, for administration purposes- """permission_required = 'exercises.change_muscle'queryset = Muscle.objects.order_by('name')template_name = 'muscles/admin-overview.html'diff --git a/wger/utils/tests/test_middleware.py b/wger/utils/tests/test_middleware.pyindex cf58cbc79..1e06f5a57 100644--- a/wger/utils/tests/test_middleware.py+++ b/wger/utils/tests/test_middleware.py@@ -77,6 +77,3 @@ class RobotsExclusionMiddlewareTestCase(WgerTestCase):response = self.client.get(reverse('exercise:exercise:view', kwargs={'id': 1}))self.assertFalse(response.get('X-Robots-Tag'))-- response = self.client.get(reverse('exercise:muscle:overview'))- self.assertFalse(response.get('X-Robots-Tag'))