{{ object }}
{% block detailspanel %}
-
{% trans "Attributes" %}
| {{ object|verbose:"title" }} | diff --git a/geotrek/common/tests/test_attachments.py b/geotrek/common/tests/test_attachments.py index db17c15482..7878a8091c 100644 --- a/geotrek/common/tests/test_attachments.py +++ b/geotrek/common/tests/test_attachments.py @@ -230,7 +230,7 @@ def attachmentPostData(self): 'legend': "A legend", 'attachment_accessibility_file': get_dummy_uploaded_image(name='face.png'), 'info_accessibility': 'slope', - 'next': f"{self.object.get_detail_url()}?tab=attachments-accessibility" + 'next': f"{self.object.get_detail_url()}?tab=attachments" } return data @@ -238,7 +238,7 @@ def test_upload_redirects_to_trek_detail_url(self): response = self.client.post(add_url_for_obj(self.object), data=self.attachmentPostData()) self.assertEqual(response.status_code, 302) - self.assertEqual(response['location'], f"{self.object.get_detail_url()}?tab=attachments-accessibility") + self.assertEqual(response['location'], f"{self.object.get_detail_url()}?tab=attachments") self.assertEqual(3, AccessibilityAttachment.objects.count()) self.client.force_login(user=self.user) @@ -278,7 +278,7 @@ def attachmentPostData(self): 'legend': "A legend", 'attachment_accessibility_file': get_dummy_uploaded_image(name='face.png'), 'info_accessibility': 'slope', - 'next': f"{self.object.get_detail_url()}?tab=attachments-accessibility" + 'next': f"{self.object.get_detail_url()}?tab=attachments" } return data @@ -300,7 +300,7 @@ def test_post_update_url(self): data=self.attachmentPostData(), ) self.assertEqual(response.status_code, 302) - self.assertEqual(response['location'], f"{self.object.get_detail_url()}?tab=attachments-accessibility") + self.assertEqual(response['location'], f"{self.object.get_detail_url()}?tab=attachments") self.attachment.refresh_from_db() self.assertEqual(self.attachment.legend, "A legend") self.client.force_login(user=self.user) @@ -318,7 +318,7 @@ def test_get_delete_with_perms_url(self): self.client.force_login(user=self.superuser) response = self.client.get(delete_url_for_obj(self.attachment)) self.assertEqual(response.status_code, 302) - self.assertEqual(response['location'], f"{self.object.get_detail_url()}?tab=attachments-accessibility") + self.assertEqual(response['location'], f"{self.object.get_detail_url()}?tab=attachments") self.assertEqual(1, AccessibilityAttachment.objects.count()) self.client.force_login(user=self.user) @@ -334,7 +334,7 @@ def user_perms(p, obj=None): self.client.force_login(user=self.user) response = self.client.get(delete_url_for_obj(self.attachment)) self.assertEqual(response.status_code, 302) - self.assertEqual(response['location'], f"{self.object.get_detail_url()}?tab=attachments-accessibility") + self.assertEqual(response['location'], f"{self.object.get_detail_url()}?tab=attachments") self.assertEqual(2, AccessibilityAttachment.objects.count()) response = self.client.get(delete_url_for_obj(self.attachment), follow=True) self.assertIn(b'You are not allowed to delete this attachment.', response.content) @@ -446,7 +446,7 @@ def test_attachment_is_larger_max_size(self): 'attachment_accessibility_file': SimpleUploadedFile(file.name, file.read(), content_type='image/png'), 'author': "newauthor", 'info_accessibility': 'slope', - 'next': f"{self.object.get_detail_url()}?tab=attachments-accessibility" + 'next': f"{self.object.get_detail_url()}?tab=attachments" } ) self.assertEqual(response.status_code, 302) @@ -462,7 +462,7 @@ def test_attachment_is_larger_max_size(self): 'attachment_accessibility_file': big_image, 'author': "newauthor", 'info_accessibility': 'slope', - 'next': f"{self.object.get_detail_url()}?tab=attachments-accessibility" + 'next': f"{self.object.get_detail_url()}?tab=attachments" }, follow=True ) @@ -488,7 +488,7 @@ def test_attachment_is_not_wide_enough(self): 'author': "newauthor", 'legend': "A legend", 'info_accessibility': 'slope', - 'next': f"{self.object.get_detail_url()}?tab=attachments-accessibility" + 'next': f"{self.object.get_detail_url()}?tab=attachments" } ) self.assertEqual(response.status_code, 302) @@ -508,7 +508,7 @@ def test_attachment_is_not_wide_enough(self): 'attachment_accessibility_file': SimpleUploadedFile(small_file.name, small_file.read(), content_type='image/png'), 'author': "newauthor", 'info_accessibility': 'slope', - 'next': f"{self.object.get_detail_url()}?tab=attachments-accessibility" + 'next': f"{self.object.get_detail_url()}?tab=attachments" }, follow=True ) @@ -535,7 +535,7 @@ def test_attachment_is_not_tall_enough(self): 'attachment_accessibility_file': SimpleUploadedFile(file.name, file.read(), content_type='image/png'), 'author': "newauthor", 'info_accessibility': 'slope', - 'next': f"{self.object.get_detail_url()}?tab=attachments-accessibility" + 'next': f"{self.object.get_detail_url()}?tab=attachments" } ) self.assertEqual(response.status_code, 302) @@ -555,7 +555,7 @@ def test_attachment_is_not_tall_enough(self): 'author': "newauthor", 'legend': "A legend", 'info_accessibility': 'slope', - 'next': f"{self.object.get_detail_url()}?tab=attachments-accessibility" + 'next': f"{self.object.get_detail_url()}?tab=attachments" }, follow=True ) @@ -577,7 +577,7 @@ def test_attachment_deleted(self): 'author': "newauthor", 'legend': "A legend", 'info_accessibility': 'slope', - 'next': f"{self.object.get_detail_url()}?tab=attachments-accessibility" + 'next': f"{self.object.get_detail_url()}?tab=attachments" } ) self.assertEqual(response.status_code, 302) diff --git a/geotrek/common/views.py b/geotrek/common/views.py index 2f2aab8edd..76824e0b9b 100644 --- a/geotrek/common/views.py +++ b/geotrek/common/views.py @@ -43,7 +43,7 @@ from mapentity import views as mapentity_views from mapentity.helpers import api_bbox from mapentity.registry import app_settings, registry -from mapentity.views import MapEntityList +from mapentity.views import MapEntityList, MapEntityFilter from paperclip import settings as settings_paperclip from paperclip.views import _handle_attachment_form from rest_framework import mixins, viewsets @@ -292,14 +292,19 @@ def import_update_json(request): class HDViewPointList(MapEntityList): queryset = HDViewPoint.objects.all() - filterform = HDViewPointFilterSet columns = ['id', 'title'] +class HDViewPointFilter(MapEntityFilter): + model = HDViewPoint + filterset_class = HDViewPointFilterSet + + class HDViewPointViewSet(GeotrekMapentityViewSet): model = HDViewPoint serializer_class = HDViewPointSerializer geojson_serializer_class = HDViewPointGeoJSONSerializer + filterset_class = HDViewPointFilterSet mapentity_list_class = HDViewPointList def get_queryset(self): @@ -482,7 +487,7 @@ def delete_attachment_accessibility(request, attachment_pk): else: error_msg = _('You are not allowed to delete this attachment.') messages.error(request, error_msg) - return HttpResponseRedirect(f"{obj.get_detail_url()}?tab=attachments-accessibility") + return HttpResponseRedirect(f"{obj.get_detail_url()}?tab=attachments") home = last_list diff --git a/geotrek/core/templates/core/path_detail_attributes.html b/geotrek/core/templates/core/path_detail_attributes.html index 6736e81e65..eecf9b27a6 100644 --- a/geotrek/core/templates/core/path_detail_attributes.html +++ b/geotrek/core/templates/core/path_detail_attributes.html @@ -3,7 +3,6 @@ {% block attributes %} -|||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| {{ object|verbose:"name" }} | diff --git a/geotrek/core/templates/core/trail_detail.html b/geotrek/core/templates/core/trail_detail.html index 4892505243..11d1fc3827 100644 --- a/geotrek/core/templates/core/trail_detail.html +++ b/geotrek/core/templates/core/trail_detail.html @@ -8,4 +8,4 @@||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| {{ trail|verbose:"structure" }} | diff --git a/geotrek/core/views.py b/geotrek/core/views.py index 5154f27c85..cc92628638 100644 --- a/geotrek/core/views.py +++ b/geotrek/core/views.py @@ -19,7 +19,7 @@ from django.views.generic.detail import BaseDetailView from mapentity.serializers import GPXSerializer from mapentity.views import (MapEntityList, MapEntityDetail, MapEntityDocument, MapEntityCreate, MapEntityUpdate, - MapEntityDelete, MapEntityFormat, LastModifiedMixin) + MapEntityDelete, MapEntityFormat, LastModifiedMixin, MapEntityFilter) from rest_framework.decorators import action from rest_framework.renderers import JSONRenderer, BrowsableAPIRenderer from rest_framework.response import Response @@ -60,14 +60,19 @@ def get_initial(self): class PathList(CustomColumnsMixin, MapEntityList): queryset = Path.objects.all() - filterform = PathFilterSet mandatory_columns = ['id', 'checkbox', 'name', 'length'] default_extra_columns = ['length_2d'] unorderable_columns = ['checkbox'] searchable_columns = ['id', 'name'] +class PathFilter(MapEntityFilter): + model = Path + filterset_class = PathFilterSet + + class PathFormatList(MapEntityFormat, PathList): + filterset_class = PathFilterSet mandatory_columns = ['id'] default_extra_columns = [ 'structure', 'valid', 'visible', 'name', 'comments', 'departure', 'arrival', @@ -343,13 +348,18 @@ class CertificationTrailMixin(FormsetMixin): class TrailList(CustomColumnsMixin, MapEntityList): queryset = Trail.objects.existing() - filterform = TrailFilterSet mandatory_columns = ['id', 'name'] default_extra_columns = ['departure', 'arrival', 'length'] searchable_columns = ['id', 'name', 'departure', 'arrival', ] +class TrailFilter(MapEntityFilter): + model = Trail + filterset_class = TrailFilterSet + + class TrailFormatList(MapEntityFormat, TrailList): + filterset_class = TrailFilterSet mandatory_columns = ['id'] default_extra_columns = [ 'structure', 'name', 'comments', diff --git a/geotrek/diving/templates/diving/dive_detail_attributes.html b/geotrek/diving/templates/diving/dive_detail_attributes.html index b9b3218f4d..cd61aff019 100644 --- a/geotrek/diving/templates/diving/dive_detail_attributes.html +++ b/geotrek/diving/templates/diving/dive_detail_attributes.html @@ -2,7 +2,6 @@ {% load i18n mapentity_tags %} {% block attributes %} -|||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| {{ object|verbose:"structure" }} | diff --git a/geotrek/diving/views.py b/geotrek/diving/views.py index 9fcb84fa98..ffb9e3ffda 100644 --- a/geotrek/diving/views.py +++ b/geotrek/diving/views.py @@ -1,6 +1,6 @@ from django.conf import settings from django.contrib.gis.db.models.functions import Transform -from mapentity.views import (MapEntityList, MapEntityFormat, MapEntityDetail, MapEntityMapImage, +from mapentity.views import (MapEntityList, MapEntityFormat, MapEntityFilter, MapEntityDetail, MapEntityMapImage, MapEntityDocument, MapEntityCreate, MapEntityUpdate, MapEntityDelete) from geotrek.authent.decorators import same_structure_required @@ -15,7 +15,6 @@ class DiveList(CustomColumnsMixin, FlattenPicturesMixin, MapEntityList): - filterform = DiveFilterSet queryset = Dive.objects.existing() mandatory_columns = ['id', 'name'] default_extra_columns = ['levels', 'thumbnail'] @@ -23,7 +22,13 @@ class DiveList(CustomColumnsMixin, FlattenPicturesMixin, MapEntityList): searchable_columns = ['id', 'name'] +class DiveFilter(MapEntityFilter): + model = Dive + filterset_class = DiveFilterSet + + class DiveFormatList(MapEntityFormat, DiveList): + filterset_class = DiveFilterSet mandatory_columns = ['id'] default_extra_columns = [ 'eid', 'structure', 'name', 'departure', diff --git a/geotrek/feedback/locale/de/LC_MESSAGES/django.po b/geotrek/feedback/locale/de/LC_MESSAGES/django.po index a65044cb84..f5d7486e88 100644 --- a/geotrek/feedback/locale/de/LC_MESSAGES/django.po +++ b/geotrek/feedback/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-04 15:20+0000\n" +"POT-Creation-Date: 2025-01-06 15:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|
- {% if perms.maintenance.add_intervention %}
- {% trans "Intervention" %}- {% with columns="name,status,stake,total_cost,begin_date,end_date" %} - {% valuetable report.interventions.all columns=columns %} - {% endwith %} - {% if not suricate_workflow_enabled %} - - - {% elif suricate_workflow_enabled and report.interventions.all|length == 0 %} - {% if report.status.identifier == 'late_intervention' or report.status.identifier == 'waiting' %} - - - {% endif %} - {% endif %} - |
- {% endif %}
-
| {{ object|verbose:"structure" }} | diff --git a/geotrek/infrastructure/views.py b/geotrek/infrastructure/views.py index 452834ca0e..29e9896a11 100755 --- a/geotrek/infrastructure/views.py +++ b/geotrek/infrastructure/views.py @@ -8,6 +8,7 @@ MapEntityDocument, MapEntityFormat, MapEntityList, + MapEntityFilter, MapEntityUpdate, ) @@ -25,13 +26,18 @@ class InfrastructureList(CustomColumnsMixin, MapEntityList): queryset = Infrastructure.objects.existing() - filterform = InfrastructureFilterSet mandatory_columns = ['id', 'name'] default_extra_columns = ['type', 'conditions', 'cities'] searchable_columns = ['id', 'name'] +class InfrastructureFilter(MapEntityFilter): + model = Infrastructure + filterset_class = InfrastructureFilterSet + + class InfrastructureFormatList(MapEntityFormat, InfrastructureList): + filterset_class = InfrastructureFilterSet mandatory_columns = ['id'] default_extra_columns = [ 'id', 'name', 'type', 'conditions', 'description', 'accessibility', diff --git a/geotrek/land/views.py b/geotrek/land/views.py index c12103828c..3e28ac8fd0 100644 --- a/geotrek/land/views.py +++ b/geotrek/land/views.py @@ -1,6 +1,6 @@ from django.conf import settings from django.contrib.gis.db.models.functions import Transform -from mapentity.views import (MapEntityList, MapEntityFormat, MapEntityDetail, MapEntityDocument, +from mapentity.views import (MapEntityList, MapEntityFormat, MapEntityFilter, MapEntityDetail, MapEntityDocument, MapEntityCreate, MapEntityUpdate, MapEntityDelete) from geotrek.common.mixins.views import CustomColumnsMixin @@ -22,12 +22,17 @@ class PhysicalEdgeList(CustomColumnsMixin, CreateFromTopologyMixin, MapEntityList): queryset = PhysicalEdge.objects.existing() - filterform = PhysicalEdgeFilterSet mandatory_columns = ['id', 'physical_type'] default_extra_columns = ['length', 'length_2d'] +class PhysicalEdgeFilter(MapEntityFilter): + model = PhysicalEdge + filterset_class = PhysicalEdgeFilterSet + + class PhysicalEdgeFormatList(MapEntityFormat, PhysicalEdgeList): + filterset_class = PhysicalEdgeFilterSet mandatory_columns = ['id', 'physical_type'] default_extra_columns = [ 'date_insert', 'date_update', @@ -77,12 +82,17 @@ def get_queryset(self): class LandEdgeList(CustomColumnsMixin, MapEntityList): queryset = LandEdge.objects.existing() - filterform = LandEdgeFilterSet mandatory_columns = ['id', 'land_type'] default_extra_columns = ['length', 'length_2d'] +class LandEdgeFilter(MapEntityFilter): + model = LandEdge + filterset_class = LandEdgeFilterSet + + class LandEdgeFormatList(MapEntityFormat, LandEdgeList): + filterset_class = LandEdgeFilterSet mandatory_columns = ['id'] default_extra_columns = [ 'land_type', 'owner', 'agreement', 'date_insert', 'date_update', @@ -130,12 +140,17 @@ def get_queryset(self): class CirculationEdgeList(CustomColumnsMixin, MapEntityList): queryset = CirculationEdge.objects.existing() - filterform = CirculationEdgeFilterSet mandatory_columns = ['id', 'circulation_type', 'authorization_type'] default_extra_columns = ['length', 'length_2d'] +class CirculationEdgeFilter(MapEntityFilter): + model = CirculationEdge + filterset_class = CirculationEdgeFilterSet + + class CirculationEdgeFormatList(MapEntityFormat, CirculationEdgeList): + filterset_class = CirculationEdgeFilterSet mandatory_columns = ['id'] default_extra_columns = [ 'circulation_type', 'authorization_type', 'date_insert', 'date_update', @@ -183,12 +198,17 @@ def get_queryset(self): class CompetenceEdgeList(CustomColumnsMixin, MapEntityList): queryset = CompetenceEdge.objects.existing() - filterform = CompetenceEdgeFilterSet mandatory_columns = ['id', 'organization'] default_extra_columns = ['length', 'length_2d'] +class CompetenceEdgeFilter(MapEntityFilter): + model = CompetenceEdge + filterset_class = CompetenceEdgeFilterSet + + class CompetenceEdgeFormatList(MapEntityFormat, CompetenceEdgeList): + filterset_class = CompetenceEdgeFilterSet mandatory_columns = ['id', 'organization'] default_extra_columns = [ 'date_insert', 'date_update', @@ -236,12 +256,17 @@ def get_queryset(self): class WorkManagementEdgeList(CustomColumnsMixin, MapEntityList): queryset = WorkManagementEdge.objects.existing() - filterform = WorkManagementEdgeFilterSet mandatory_columns = ['id', 'organization'] default_extra_columns = ['length', 'length_2d'] +class WorkManagementEdgeFilter(MapEntityFilter): + model = WorkManagementEdge + filterset_class = WorkManagementEdgeFilterSet + + class WorkManagementEdgeFormatList(MapEntityFormat, WorkManagementEdgeList): + filterset_class = WorkManagementEdgeFilterSet mandatory_columns = ['id', 'organization'] default_extra_columns = [ 'date_insert', 'date_update', 'cities', 'districts', 'areas', 'uuid', 'length_2d' @@ -288,12 +313,17 @@ def get_queryset(self): class SignageManagementEdgeList(CustomColumnsMixin, MapEntityList): queryset = SignageManagementEdge.objects.existing() - filterform = SignageManagementEdgeFilterSet mandatory_columns = ['id', 'organization'] default_extra_columns = ['length', 'length_2d'] +class SignageManagementEdgeFilter(MapEntityFilter): + model = SignageManagementEdge + filterset_class = SignageManagementEdgeFilterSet + + class SignageManagementEdgeFormatList(MapEntityFormat, SignageManagementEdgeList): + filterset_class = SignageManagementEdgeFilterSet mandatory_columns = ['id', 'organization'] default_extra_columns = [ 'date_insert', 'date_update', 'cities', 'districts', 'areas', 'uuid', 'length_2d' diff --git a/geotrek/maintenance/static/maintenance/main.js b/geotrek/maintenance/static/maintenance/main.js index 29372bd072..df97ce7696 100644 --- a/geotrek/maintenance/static/maintenance/main.js +++ b/geotrek/maintenance/static/maintenance/main.js @@ -48,7 +48,7 @@ $(window).on('entity:view:add', function (e, data) { }; }); -$(window).on('entity:view:list', function (e, data) { +$(window).on('entity:view:filter', function (e, data) { if (data.modelname === "intervention"){ setDatePickerConfig('#id_begin_date_0, #id_begin_date_1, #id_end_date_0, #id_end_date_1'); }; diff --git a/geotrek/maintenance/views.py b/geotrek/maintenance/views.py index efc544b911..37128df704 100755 --- a/geotrek/maintenance/views.py +++ b/geotrek/maintenance/views.py @@ -5,7 +5,7 @@ from django.db.models import Subquery, OuterRef, Sum from django.db.models.expressions import Value from django.utils.translation import gettext_lazy as _ -from mapentity.views import (MapEntityList, MapEntityFormat, MapEntityDetail, MapEntityDocument, +from mapentity.views import (MapEntityList, MapEntityFormat, MapEntityFilter, MapEntityDetail, MapEntityDocument, MapEntityCreate, MapEntityUpdate, MapEntityDelete) from geotrek.altimetry.models import AltimetryMixin @@ -34,14 +34,19 @@ def _normalize_annotation_column_name(col_name): class InterventionList(CustomColumnsMixin, MapEntityList): queryset = Intervention.objects.existing() - filterform = InterventionFilterSet mandatory_columns = ['id', 'name'] default_extra_columns = ['begin_date', 'end_date', 'type', 'target', 'status', 'stake'] searchable_columns = ['id', 'name'] unorderable_columns = ['target'] +class InterventionFilter(MapEntityFilter): + model = Intervention + filterset_class = InterventionFilterSet + + class InterventionFormatList(MapEntityFormat, InterventionList): + filterset_class = InterventionFilterSet @classmethod def build_cost_column_name(cls, job_name): @@ -190,14 +195,19 @@ def get_queryset(self): class ProjectList(CustomColumnsMixin, MapEntityList): queryset = Project.objects.existing() - filterform = ProjectFilterSet mandatory_columns = ['id', 'name'] default_extra_columns = ['period', 'type', 'domain'] searchable_columns = ['id', 'name'] unorderable_columns = ['period', ] +class ProjectFilter(MapEntityFilter): + model = Project + filterset_class = ProjectFilterSet + + class ProjectFormatList(MapEntityFormat, ProjectList): + filterset_class = ProjectFilterSet mandatory_columns = ['id'] default_extra_columns = [ 'structure', 'name', 'period', 'type', 'domain', 'constraint', 'global_cost', diff --git a/geotrek/outdoor/templates/outdoor/course_detail_attributes.html b/geotrek/outdoor/templates/outdoor/course_detail_attributes.html index 092f126711..2fda024c8f 100644 --- a/geotrek/outdoor/templates/outdoor/course_detail_attributes.html +++ b/geotrek/outdoor/templates/outdoor/course_detail_attributes.html @@ -2,9 +2,8 @@ {% load i18n geotrek_tags mapentity_tags outdoor_tags %} {% block attributes %}
|---|
| {{ object|verbose:"structure" }} | diff --git a/geotrek/outdoor/templates/outdoor/site_detail_attributes.html b/geotrek/outdoor/templates/outdoor/site_detail_attributes.html index 809bdecb0e..4132111c88 100644 --- a/geotrek/outdoor/templates/outdoor/site_detail_attributes.html +++ b/geotrek/outdoor/templates/outdoor/site_detail_attributes.html @@ -5,7 +5,6 @@
|---|
| {{ object|verbose:"structure" }} | @@ -114,7 +113,7 @@
{% for label in object.labels.all %}
{% if label.published %}
- ☆
+ ☆
{% endif %}
{{ label.name }} {% endfor %} diff --git a/geotrek/outdoor/views.py b/geotrek/outdoor/views.py index d44c0c407f..1b2cf10816 100644 --- a/geotrek/outdoor/views.py +++ b/geotrek/outdoor/views.py @@ -3,7 +3,7 @@ from django.db.models import Prefetch from geotrek.common.models import HDViewPoint from mapentity.helpers import alphabet_enumeration -from mapentity.views import (MapEntityList, MapEntityDetail, MapEntityDocument, MapEntityCreate, +from mapentity.views import (MapEntityList, MapEntityFilter, MapEntityDetail, MapEntityDocument, MapEntityCreate, MapEntityUpdate, MapEntityDelete, MapEntityFormat) from geotrek.authent.decorators import same_structure_required @@ -18,12 +18,16 @@ class SiteList(CustomColumnsMixin, MapEntityList): queryset = Site.objects.all() - filterform = SiteFilterSet mandatory_columns = ['id', 'name'] default_extra_columns = ['super_practices', 'date_update'] searchable_columns = ['id', 'name'] +class SiteFilter(MapEntityFilter): + model = Site + filterset_class = SiteFilterSet + + class SiteDetail(CompletenessMixin, MapEntityDetail): queryset = Site.objects.all().prefetch_related( Prefetch('view_points', @@ -104,6 +108,7 @@ class SiteMarkupPublic(SiteDocumentPublicMixin, MarkupPublic): class SiteFormatList(MapEntityFormat, SiteList): + filterset_class = SiteFilterSet mandatory_columns = ['id'] default_extra_columns = [ 'structure', 'name', 'practice', 'description', @@ -130,12 +135,16 @@ def get_queryset(self): class CourseList(CustomColumnsMixin, MapEntityList): queryset = Course.objects.select_related('type').prefetch_related('parent_sites').all() - filterform = CourseFilterSet mandatory_columns = ['id', 'name'] default_extra_columns = ['parent_sites', 'date_update'] searchable_columns = ['id', 'name'] +class CourseFilter(MapEntityFilter): + model = Course + filterset_class = CourseFilterSet + + class CourseDetail(CompletenessMixin, MapEntityDetail): queryset = Course.objects.prefetch_related('type').all() @@ -208,6 +217,7 @@ class CourseMarkupPublic(CourseDocumentPublicMixin, MarkupPublic): class CourseFormatList(MapEntityFormat, CourseList): + filterset_class = CourseFilterSet mandatory_columns = ['id'] default_extra_columns = [ 'structure', 'name', 'parent_sites', 'description', 'advice', 'equipment', 'accessibility', diff --git a/geotrek/sensitivity/templates/sensitivity/sensitivearea_detail_attributes.html b/geotrek/sensitivity/templates/sensitivity/sensitivearea_detail_attributes.html index bbaaa39ab0..426e9a47a6 100644 --- a/geotrek/sensitivity/templates/sensitivity/sensitivearea_detail_attributes.html +++ b/geotrek/sensitivity/templates/sensitivity/sensitivearea_detail_attributes.html @@ -10,7 +10,6 @@ padding: 2px; } - {% trans "Attributes" %}
|
|---|