Self hosted FLOSS fitness/workout, nutrition and weight tracker
Correctly filter in equipment overview by exercise language
Roland Geidere0d679753b39
diff --git a/wger/exercises/templates/equipment/overview.html b/wger/exercises/templates/equipment/overview.htmlindex 61407e937..2804df7af 100644--- a/wger/exercises/templates/equipment/overview.html+++ b/wger/exercises/templates/equipment/overview.html@@ -55,6 +55,7 @@ $(function() {<table class="narrow"><tbody>{% for exercise in equipment.exercise_set.all %}+ {% if exercise.language in exercise_languages %}<tr><td style="padding-left:0px;">{% if exercise.main_image %}@@ -69,6 +70,7 @@ $(function() {{{ exercise.name }}</a></td></tr>+ {% endif %}{% empty %}<tr><td>diff --git a/wger/exercises/templates/mobile/equipment/overview.html b/wger/exercises/templates/mobile/equipment/overview.htmlindex e2e893048..1b202aa4d 100644--- a/wger/exercises/templates/mobile/equipment/overview.html+++ b/wger/exercises/templates/mobile/equipment/overview.html@@ -23,6 +23,7 @@<ul data-role="listview">{% for exercise in equipment.exercise_set.all %}+ {% if exercise.language in exercise_languages %}<li><a href="{{ exercise.get_absolute_url }}" data-ajax="false">{% if exercise.main_image.image %}@@ -30,6 +31,7 @@{% endif %}{{ exercise.name }}</a></li>+ {% endif %}{% empty %}<li>{% trans "No exercises for this equipment. Add or edit an exercise and set the equipment." %}diff --git a/wger/exercises/views/equipment.py b/wger/exercises/views/equipment.pyindex 3be4d2c35..2d7040372 100644--- a/wger/exercises/views/equipment.py+++ b/wger/exercises/views/equipment.py@@ -24,6 +24,7 @@ from django.views.generic import CreateViewfrom django.views.generic import UpdateViewfrom django.views.generic import DeleteViewfrom django.views.generic import ListView+from wger.config.models import LanguageConfigfrom wger.exercises.models import Equipment@@ -31,6 +32,7 @@ from wger.utils.generic_views import WgerFormMixinfrom wger.utils.generic_views import WgerDeleteMixinfrom wger.utils.generic_views import WgerPermissionMixinfrom wger.utils.constants import PAGINATION_OBJECTS_PER_PAGE+from wger.utils.language import load_item_languageslogger = logging.getLogger('wger.custom')@@ -123,3 +125,11 @@ class EquipmentOverviewView(WgerPermissionMixin, ListView):model = Equipmenttemplate_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)+ context['exercise_languages'] = load_item_languages(LanguageConfig.SHOW_ITEM_EXERCISES)+ return context