Self hosted FLOSS fitness/workout, nutrition and weight tracker
Delete unused code
Roland Geiderb6b1455b477b
diff --git a/wger/exercises/models/base.py b/wger/exercises/models/base.pyindex f73808819..f9e4b90b9 100644--- a/wger/exercises/models/base.py+++ b/wger/exercises/models/base.py@@ -116,7 +116,7 @@ class ExerciseBase(AbstractLicenseModel, AbstractHistoryMixin, models.Model):"""Returns the canonical URL to view an exercise"""- return reverse('exercise:exercise:view-base', kwargs={'id': self.id})+ return reverse('exercise:exercise:view-base', kwargs={'pk': self.id})## Own methodsdiff --git a/wger/exercises/models/exercise.py b/wger/exercises/models/exercise.pyindex 0908993ab..bf80d8631 100644--- a/wger/exercises/models/exercise.py+++ b/wger/exercises/models/exercise.py@@ -119,7 +119,7 @@ class Exercise(AbstractLicenseModel, AbstractHistoryMixin, models.Model):return reverse('exercise:exercise:view-base',kwargs={- 'id': self.exercise_base_id,+ 'pk': self.exercise_base_id,'slug': slugify(self.name)})diff --git a/wger/exercises/templates/exercise/pending.html b/wger/exercises/templates/exercise/pending.htmldeleted file mode 100644index 8c8f73e74..000000000--- a/wger/exercises/templates/exercise/pending.html+++ /dev/null@@ -1,37 +0,0 @@-{% extends "base.html" %}-{% load i18n %}-{% load static %}-{% load wger_extras %}--{% block title %}{% translate "Exercises pending review" %}{% endblock %}---{% block content %}--<table class="table">-<thead>-<tr>- <th>{% translate "Submission date" %}</th>- <th>{% translate "Name" %}</th>- <th>{% translate "User" %}</th>-</tr>-</thead>-<tbody>-{% for exercise in exercise_list %}-<tr>- <td>- {{exercise.creation_date}}- </td>- <td><a href="{{ exercise.get_absolute_url }}">{{exercise.name}}</a></td>- <td>{{exercise.license_author}}</td>-</tr>-{% empty %}-<tr>- <td colspan="2">{% translate "Nothing found" %}</td>-</tr>-{% endfor %}-</tbody>--</table>-<div style="padding-top:3em;"></div>-{% endblock %}diff --git a/wger/exercises/templates/exercise/view.html b/wger/exercises/templates/exercise/view.htmldeleted file mode 100644index 16a4a8d5f..000000000--- a/wger/exercises/templates/exercise/view.html+++ /dev/null@@ -1,260 +0,0 @@-{% extends "base.html" %}-{% load i18n static wger_extras thumbnail cache django_bootstrap_breadcrumbs %}---{# #}-{# Opengraph #}-{# #}-{% block opengraph %}- {{ block.super }}- <meta property="og:title" content="{{ exercise.name }}">- <meta property="og:description" content="{{ exercise.description_clean }}">-{% endblock %}-{% block opengraphimages %}- {% for image in exercise.images.accepted %}- <meta property="og:image" content="{{ image.image.url }}">- {% empty %}- <meta property="og:image" content="{{ image_absolute_path }}">- {% endfor %}-{% endblock %}---{# #}-{# Title #}-{# #}-{% block title %}{{ exercise.name }}{% endblock %}---{# #}-{# Header #}-{# #}-{% block header %}-<script>-$(document).ready(function() {- wgerDrawWeightLogChart({{json|safe}}, "{{svg_uuid}}");-});-</script>-{% endblock %}---{# #}-{# Content #}-{# #}-{% block content %}--<h5 class="mt-4">{% translate "Category" %}:</h5>-{% translate exercise.category.name %}--{% if exercise.equipment.all %}- <h5 class="mt-4">{% translate "Equipment" %}:</h5>- {% for equipment in exercise.equipment.all %}- {% translate equipment.name %}- {% if not forloop.last %}, {% endif %}- {% endfor %}-{% endif %}---<h5 class="mt-4">{% translate "Description" %}:</h5>-{{ exercise.description|safe }}----{# Images #}-{% with images=exercise.images.all %}-{% if images or perms.exercises.change_exerciseimage %}- <h5 class="mt-4">{% translate "Images" %}:</h5>- <div class="row row-cols-2 row-cols-md-3">- {% with other_images=images %}- {% for image in other_images %}-- <div class="col mb-4">- <div class="card h-100">- <a href="{{ image.image.url }}" title="Image for {{exercise}}">- <img class="card-img-top" src="{{ image.image|thumbnail_url:'large' }}" alt="">- </a>- <div class="card-body text-center">--- {% if image.is_main %}- <p class="card-text text-wger-green">- <span class="{% fa_class 'medal' %}"></span>- </p>- {% endif %}- </div>- <div class="card-footer">- {{image.get_license_display}}- {% if image.license_author %}- {{image.license_author}}- {% endif %}- </div>- </div>- </div>- {% endfor %}- {% endwith %}- </div>-{% endif %}-{% endwith %}---{# Videos #}-{% with videos=exercise.videos.all %}-{% if videos or perms.exercises.change_exercisevideo %}- <h5 class="mt-4">{% translate "Videos" %}</h5>- <div class="row row-cols-1 row-cols-md-2">- {% for video in videos %}- <div class="col mb-4">- <div class="card h-100">- <video controls preload="metadata" class="card-img-top">- <source src='{{ MEDIA_URL }}{{ video.video }}'>- Your browser does not support the video tag.- </video>- <div class="card-body text-center">-- </div>- <div class="card-footer">- {{video.get_license_display}}- {% if video.license_author %}- {{video.license_author}}- {% endif %}- </div>- </div>- </div>- {% endfor %}- </div>-{% endif %}-{% endwith %}---{# Comments #}-{% with comments=exercise.exercisecomment_set.all %}-{% if comments or perms.exercises.change_exercisecomment %}- <h5 class="mt-4">{% translate "Comments for this exercise" %}:</h5>- <ul>- {% for comment in comments %}- <li>- {{ comment }}-- {% if perms.exercises.change_exercisecomment %}- <span class="dropdown">- <button type="button" class="btn btn-link dropdown-toggle btn-sm" data-toggle="dropdown"></button>- <div class="dropdown-menu">- <a href="{% url 'exercise:comment:edit' comment.id %}" class="dropdown-item wger-modal-dialog">- <span class="{% fa_class 'edit' %}"></span>- {% translate 'Edit' %}- </a>- <div class="dropdown-divider"></div>- <a href="{% url 'exercise:comment:delete' comment.id %}" class="dropdown-item">- <span class="{% fa_class 'trash' %}"></span>- {% translate 'Delete' %}- </a>- </div>- </span>- {% endif %}- </li>- {% endfor %}- </ul>- {% if perms.exercises.change_exercisecomment %}- <p>- <a href="{% url 'exercise:comment:add' exercise.id %}" class="wger-modal-dialog">- {% translate "Add new comment" %}- </a>- </p>- {% endif %}-{% endif %}-{% endwith %}-----{% cache cache_timeout exercise-detail-muscles cache_vary_on %}-{% if muscles_main_front or muscles_main_back %}- <h5 class="mt-4">{% translate "Muscles" %}:</h5>- <p>- {% translate "The diagram shows the most used muscles on this exercise" %}- </p>- <p>- <span style="width:1em;height:1em;background-color:#cc0000;float:left;margin-right:0.5em;"></span>- {% translate "Main muscles" %}- </p>- <p>- <span style="width:1em;height:1em;background-color:#f57900;float:left;margin-right:0.5em;"></span>- {% translate "Secondary muscles" %}- </p>-- <div class="row ">- <div class="col">- {% render_muscles muscles_main_front muscles_sec_front %}- <ul class="list-unstyled text-center">- {% for muscle in muscles_main_front %}- <li>{{muscle.name}}</li>- {% endfor %}-- {% for muscle in muscles_sec_front %}- <li>{{muscle.name}}</li>- {% endfor %}- </ul>- </div>- <div class="col">- {% render_muscles muscles_main_back muscles_sec_back %}- <ul class="list-unstyled text-center">- {% for muscle in muscles_main_back %}- <li>{{muscle.name}}</li>- {% endfor %}-- {% for muscle in muscles_sec_back %}- <li>{{muscle.name}}</li>- {% endfor %}- </ul>- </div>- </div>-{% endif %}-{% endcache %}--{% if logs %}- <h5 class="mt-4">{% translate "Weight log" %}:</h5>- {% render_weight_log logs svg_uuid user %}-{% endif %}--{% if exercise.variations %}- <h5 class="mt-4">{% translate "Exercise Variations" %}:</h5>- <ul>- {% for variation in exercise.variations %}- <li>- <a href="{{ variation.get_absolute_url }}">{{ variation }}</a>- </li>- {% endfor %}- </ul>-{% endif %}-{% endblock %}---{# #}-{# Side bar #}-{# #}-{% block sidebar %}-{% license_sidebar exercise.license exercise.license_author %}-{% endblock %}----{# #}-{# Options #}-{# #}-{% block options %}-{% if perms.exercises.change_exercise %}-<div class="btn-group">- <div class="btn-group">- <button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">- <span class="{% fa_class 'cog' %}"></span>- {% translate "Options" %}- </button>- <div class="dropdown-menu">- <a href="{% url 'exercise:exercise:delete' exercise.id %}" class="wger-modal-dialog dropdown-item">- <span class="{% fa_class 'trash' %}"></span>- {% translate "Delete" %}- </a>- </div>- </div>-</div>-{% endif %}-{% endblock %}diff --git a/wger/exercises/tests/test_exercise_translation.py b/wger/exercises/tests/test_exercise_translation.pyindex 2292e27ad..61c4ee9da 100644--- a/wger/exercises/tests/test_exercise_translation.py+++ b/wger/exercises/tests/test_exercise_translation.py@@ -57,92 +57,6 @@ class ExerciseRepresentationTestCase(WgerTestCase):self.assertEqual("{0}".format(Exercise.objects.get(pk=1)), 'An exercise')-class ExerciseShareButtonTestCase(WgerTestCase):- """- Test that the share button is correctly displayed and hidden- """-- def test_share_button(self):- exercise = Exercise.objects.get(pk=1)- url = exercise.get_absolute_url()-- 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 ExerciseDetailTestCase(WgerTestCase):- """- Tests the exercise details page- """-- def exercise_detail(self, editor=False):- """- Tests the exercise details page- """-- response = self.client.get(reverse('exercise:exercise:view', kwargs={'id': 1}))- self.assertEqual(response.status_code, 200)-- # Correct tab is selected- self.assertEqual(response.context['active_tab'], WORKOUT_TAB)-- # Exercise loaded correct muscles- exercise_1 = response.context['exercise']- self.assertEqual(exercise_1.id, 1)-- muscles = exercise_1.exercise_base.muscles.all()- muscle_1 = muscles[0]- muscle_2 = muscles[1]-- self.assertEqual(muscle_1.id, 1)- self.assertEqual(muscle_2.id, 2)-- # Only authorized users see the edit links- if editor:- self.assertContains(response, 'Edit')- self.assertContains(response, 'Delete')- self.assertContains(response, 'Add new comment')- else:- self.assertNotContains(response, 'Edit')- self.assertNotContains(response, 'Delete')- self.assertNotContains(response, 'Add new comment')-- # Ensure that non-existent exercises throw a 404.- response = self.client.get(reverse('exercise:exercise:view', kwargs={'id': 42}))- self.assertEqual(response.status_code, 404)-- def test_exercise_detail_editor(self):- """- Tests the exercise details page as a logged-in user with editor rights- """-- self.user_login('admin')- self.exercise_detail(editor=True)-- def test_exercise_detail_non_editor(self):- """- Tests the exercise details page as a logged-in user without editor rights- """-- self.user_login('test')- self.exercise_detail(editor=False)-- def test_exercise_detail_logged_out(self):- """- Tests the exercise details page as an anonymous (logged out) user- """-- self.exercise_detail(editor=False)--class ExercisesTestCase(WgerTestCase):"""Exercise test case@@ -213,39 +127,6 @@ class DeleteExercisesTestCase(WgerDeleteTestCase):user_fail = 'test'-class ExercisesCacheTestCase(WgerTestCase):- """- Exercise cache test case- """-- def test_muscles_cache_update_on_delete(self):- """- Test that the template cache for the overview is correctly reset when- performing certain operations- """- self.assertFalse(cache.get(make_template_fragment_key('exercise-detail-muscles', ["2-2"])))- self.client.get(reverse('exercise:exercise:view', kwargs={'id': 2}))- self.assertTrue(cache.get(make_template_fragment_key('exercise-detail-muscles', ["2-2"])))-- muscle = Muscle.objects.get(pk=2)- muscle.delete()- self.assertFalse(cache.get(make_template_fragment_key('exercise-detail-muscles', ["2-2"])))-- def test_muscles_cache_update_on_update(self):- """- Test that the template cache for the overview is correctly reset when- performing certain operations- """- self.assertFalse(cache.get(make_template_fragment_key('exercise-detail-muscles', ["2-2"])))- self.client.get(reverse('exercise:exercise:view', kwargs={'id': 2}))- self.assertTrue(cache.get(make_template_fragment_key('exercise-detail-muscles', ["2-2"])))-- muscle = Muscle.objects.get(pk=2)- muscle.name = 'foo'- muscle.save()- self.assertFalse(cache.get(make_template_fragment_key('exercise-detail-muscles', ["2-2"])))--class MuscleTemplateTagTest(WgerTestCase):def test_render_main_muscles(self):diff --git a/wger/exercises/urls.py b/wger/exercises/urls.pyindex 1e337a64b..14b9b7397 100644--- a/wger/exercises/urls.py+++ b/wger/exercises/urls.py@@ -153,12 +153,12 @@ patterns_exercise = [name='view',),path(- '<int:id>/view-base',+ '<int:pk>/view-base',TemplateView.as_view(template_name='exercise/view-base.html'),name='view-base',),- url(- r'^(?P<id>\d+)/view/(?P<slug>[-\w]*)/?$',+ path(+ '<int:pk>/view-base/<slug:slug>',TemplateView.as_view(template_name='exercise/view-base.html'),name='view-base',),diff --git a/wger/exercises/views/exercises.py b/wger/exercises/views/exercises.pyindex 1fc4af881..47fb00abc 100644--- a/wger/exercises/views/exercises.py+++ b/wger/exercises/views/exercises.py@@ -33,11 +33,18 @@ from django.forms import (Select,Textarea,)+from django.http import (+ HttpResponsePermanentRedirect,+ HttpResponseRedirect,+)from django.shortcuts import (get_object_or_404,render,)-from django.urls import reverse_lazy+from django.urls import (+ reverse,+ reverse_lazy,+)from django.utils.translation import (gettext as _,gettext_lazy,@@ -75,35 +82,18 @@ class ExerciseListView(TemplateView):def view(request, id, slug=None):"""- Detail view for an exercise+ Detail view for an exercise translation"""-exercise = get_object_or_404(Exercise, pk=id)- context = {- 'comment_edit': False,- 'show_shariff': True,- 'exercise': exercise,- "muscles_main_front": exercise.muscles.filter(is_front=True),- "muscles_main_back": exercise.muscles.filter(is_front=False),- "muscles_sec_front": exercise.muscles_secondary.filter(is_front=True),- "muscles_sec_back": exercise.muscles_secondary.filter(is_front=False),- }-- # If the user is logged in, load the log and prepare the entries for- # rendering in the D3 chart- entry_log = []- chart_data = []- if request.user.is_authenticated:- logs = WorkoutLog.objects.filter(user=request.user, exercise_base=exercise.exercise_base)- entry_log, chart_data = process_log_entries(logs)-- context['logs'] = entry_log- context['json'] = chart_data- context['svg_uuid'] = str(uuid.uuid4())- context['cache_vary_on'] = "{}-{}".format(exercise.id, load_language().id)- context['allow_upload_videos'] = settings.WGER_SETTINGS['ALLOW_UPLOAD_VIDEOS']-- return render(request, 'exercise/view.html', context)++ return HttpResponsePermanentRedirect(+ reverse(+ 'exercise:exercise:view-base',+ kwargs={+ 'pk': exercise.exercise_base_id,+ 'slug': slug+ }+ ))class ExerciseForm(ModelForm):diff --git a/wger/manager/signals.py b/wger/manager/signals.pyindex b98aa736a..0a6ea2a0f 100644--- a/wger/manager/signals.py+++ b/wger/manager/signals.py@@ -47,26 +47,3 @@ def update_activity_cache(sender, instance, **kwargs):post_save.connect(update_activity_cache, sender=WorkoutSession)post_save.connect(update_activity_cache, sender=WorkoutLog)--# TODO: this seems to cause problems when users are deleted-# perhaps because of the cascading, needs to be checked-# post_delete.connect(update_activity_cache, sender=WorkoutSession)-# post_delete.connect(update_activity_cache, sender=WorkoutLog)---def reset_muscle_cache(sender, instance, **kwargs):- exercises = Exercise.objects.filter(- Q(exercise_base__muscles=instance)- | Q(exercise_base__muscles_secondary=instance)- ).all()- languages = Language.objects.all()-- for exercise in exercises:- for language in languages:- delete_template_fragment_cache(- 'exercise-detail-muscles', "{}-{}".format(exercise.id, language.id)- )---post_save.connect(reset_muscle_cache, sender=Muscle)-pre_delete.connect(reset_muscle_cache, sender=Muscle)