diff --git a/geotrek/core/serializers.py b/geotrek/core/serializers.py index bb1ae9de16..f97ed11769 100644 --- a/geotrek/core/serializers.py +++ b/geotrek/core/serializers.py @@ -30,7 +30,6 @@ class Meta(MapentityGeojsonModelSerializer.Meta): class TrailSerializer(DynamicFieldsMixin, serializers.ModelSerializer): - checkbox = serializers.CharField(source='checkbox_display') length = serializers.FloatField(source='length_display') name = serializers.CharField(source='name_display') category = serializers.SlugRelatedField('label', read_only=True) diff --git a/geotrek/core/tests/test_views.py b/geotrek/core/tests/test_views.py index c3925c451d..3a437630df 100644 --- a/geotrek/core/tests/test_views.py +++ b/geotrek/core/tests/test_views.py @@ -714,7 +714,7 @@ class TrailViewsTest(CommonTest): 'coordinates': [[3.0, 46.5], [3.001304, 46.5009004]], } extra_column_list = ['length', 'eid', 'departure', 'arrival'] - expected_column_list_extra = ['id', 'checkbox', 'name', 'length', 'eid', 'departure', 'arrival'] + expected_column_list_extra = ['id', 'name', 'length', 'eid', 'departure', 'arrival'] expected_column_formatlist_extra = ['id', 'length', 'eid', 'departure', 'arrival'] def get_expected_json_attrs(self): @@ -731,8 +731,7 @@ def get_expected_datatables_attrs(self): 'departure': self.obj.departure, 'id': self.obj.pk, 'length': round(self.obj.length, 1), - 'name': self.obj.name_display, - 'checkbox': self.obj.checkbox_display + 'name': self.obj.name_display } def get_good_data(self): diff --git a/geotrek/core/views.py b/geotrek/core/views.py index cbb144bfb3..a0ca179564 100644 --- a/geotrek/core/views.py +++ b/geotrek/core/views.py @@ -346,10 +346,9 @@ class CertificationTrailMixin(FormsetMixin): class TrailList(CustomColumnsMixin, MapEntityList): queryset = Trail.objects.existing() filterform = TrailFilterSet - mandatory_columns = ['id', 'checkbox', 'name'] + mandatory_columns = ['id', 'name'] default_extra_columns = ['departure', 'arrival', 'length'] searchable_columns = ['id', 'name', 'departure', 'arrival', ] - unorderable_columns = ['checkbox'] class TrailFormatList(MapEntityFormat, TrailList): diff --git a/geotrek/diving/serializers.py b/geotrek/diving/serializers.py index 645d416cd3..c630193e45 100644 --- a/geotrek/diving/serializers.py +++ b/geotrek/diving/serializers.py @@ -48,7 +48,6 @@ class Meta: class DiveSerializer(DynamicFieldsMixin, rest_serializers.ModelSerializer): - checkbox = rest_serializers.CharField(source='checkbox_display') name = rest_serializers.CharField(source='name_display') thumbnail = rest_serializers.CharField(source='thumbnail_display') levels = rest_serializers.CharField(source='levels_display') diff --git a/geotrek/diving/tests/test_views.py b/geotrek/diving/tests/test_views.py index 29d82f3b42..971f521434 100644 --- a/geotrek/diving/tests/test_views.py +++ b/geotrek/diving/tests/test_views.py @@ -19,7 +19,7 @@ class DiveViewsTests(GeotrekAPITestCase, CommonTest): 'coordinates': [-1.3630812, -5.9838563], } extra_column_list = ['depth', 'advice'] - expected_column_list_extra = ['id', 'checkbox', 'name', 'depth', 'advice'] + expected_column_list_extra = ['id', 'name', 'depth', 'advice'] expected_column_formatlist_extra = ['id', 'depth', 'advice'] def get_expected_json_attrs(self): @@ -85,7 +85,6 @@ def get_expected_datatables_attrs(self): 'levels': self.obj.levels_display, 'name': self.obj.name_display, 'thumbnail': 'None', - 'checkbox': self.obj.checkbox_display } def get_bad_data(self): diff --git a/geotrek/diving/views.py b/geotrek/diving/views.py index a882eb318e..ed2402162f 100644 --- a/geotrek/diving/views.py +++ b/geotrek/diving/views.py @@ -28,9 +28,9 @@ class DiveList(CustomColumnsMixin, FlattenPicturesMixin, MapEntityList): filterform = DiveFilterSet queryset = Dive.objects.existing() - mandatory_columns = ['id', 'checkbox', 'name'] + mandatory_columns = ['id', 'name'] default_extra_columns = ['levels', 'thumbnail'] - unorderable_columns = ['checkbox', 'thumbnail'] + unorderable_columns = ['thumbnail'] searchable_columns = ['id', 'name'] diff --git a/geotrek/infrastructure/serializers.py b/geotrek/infrastructure/serializers.py index 4bc2b97a64..42809436ee 100644 --- a/geotrek/infrastructure/serializers.py +++ b/geotrek/infrastructure/serializers.py @@ -16,7 +16,6 @@ class Meta: class InfrastructureSerializer(DynamicFieldsMixin, serializers.ModelSerializer): - checkbox = serializers.CharField(source='checkbox_display') name = serializers.CharField(source='name_display') type = serializers.CharField(source='type_display') condition = serializers.SlugRelatedField('label', read_only=True) diff --git a/geotrek/infrastructure/tests/test_views.py b/geotrek/infrastructure/tests/test_views.py index 771d6517b1..1e5a32260b 100755 --- a/geotrek/infrastructure/tests/test_views.py +++ b/geotrek/infrastructure/tests/test_views.py @@ -33,7 +33,7 @@ class InfrastructureViewsTest(GeotrekAPITestCase, CommonTest): userfactory = PathManagerFactory expected_json_geom = {'type': 'LineString', 'coordinates': [[3.0, 46.5], [3.001304, 46.5009004]]} extra_column_list = ['type', 'eid'] - expected_column_list_extra = ['id', 'checkbox', 'name', 'type', 'eid'] + expected_column_list_extra = ['id', 'name', 'type', 'eid'] expected_column_formatlist_extra = ['id', 'type', 'eid'] def get_expected_json_attrs(self): @@ -64,7 +64,6 @@ def get_expected_datatables_attrs(self): 'cities': '[]', 'condition': self.obj.condition.label, 'id': self.obj.pk, - 'checkbox': self.obj.checkbox_display, 'name': self.obj.name_display, 'type': self.obj.type.label, } @@ -108,7 +107,7 @@ class PointInfrastructureViewsTest(InfrastructureViewsTest): modelfactory = PointInfrastructureFactory expected_json_geom = {'type': 'Point', 'coordinates': [3.0, 46.5]} extra_column_list = ['type', 'eid'] - expected_column_list_extra = ['id', 'checkbox', 'name', 'type', 'eid'] + expected_column_list_extra = ['id', 'name', 'type', 'eid'] expected_column_formatlist_extra = ['id', 'type', 'eid'] def get_good_data(self): diff --git a/geotrek/infrastructure/views.py b/geotrek/infrastructure/views.py index cab3ce2671..18ac5208ef 100755 --- a/geotrek/infrastructure/views.py +++ b/geotrek/infrastructure/views.py @@ -19,10 +19,9 @@ class InfrastructureList(CustomColumnsMixin, MapEntityList): queryset = Infrastructure.objects.existing() filterform = InfrastructureFilterSet - mandatory_columns = ['id', 'checkbox', 'name'] + mandatory_columns = ['id', 'name'] default_extra_columns = ['type', 'condition', 'cities'] searchable_columns = ['id', 'name'] - unorderable_columns = ['checkbox'] class InfrastructureFormatList(MapEntityFormat, InfrastructureList): diff --git a/geotrek/land/serializers.py b/geotrek/land/serializers.py index 7aa36ba57f..7859d770e1 100644 --- a/geotrek/land/serializers.py +++ b/geotrek/land/serializers.py @@ -6,7 +6,6 @@ class LandEdgeSerializer(DynamicFieldsMixin, serializers.ModelSerializer): - checkbox = serializers.CharField(source='checkbox_display') land_type = serializers.CharField(source='land_type_display') length = serializers.FloatField(source='length_display') length_2d = serializers.FloatField(source='length_2d_display') @@ -26,7 +25,6 @@ class Meta(MapentityGeojsonModelSerializer.Meta): class PhysicalEdgeSerializer(DynamicFieldsMixin, serializers.ModelSerializer): - checkbox = serializers.CharField(source='checkbox_display') physical_type = serializers.CharField(source='physical_type_display') length = serializers.FloatField(source='length_display') length_2d = serializers.FloatField(source='length_2d_display') @@ -46,7 +44,6 @@ class Meta(MapentityGeojsonModelSerializer.Meta): class CompetenceEdgeSerializer(DynamicFieldsMixin, serializers.ModelSerializer): - checkbox = serializers.CharField(source='checkbox_display') organization = serializers.CharField(source='organization_display') length = serializers.FloatField(source='length_display') length_2d = serializers.FloatField(source='length_2d_display') @@ -66,7 +63,6 @@ class Meta(MapentityGeojsonModelSerializer.Meta): class SignageManagementEdgeSerializer(DynamicFieldsMixin, serializers.ModelSerializer): - checkbox = serializers.CharField(source='checkbox_display') organization = serializers.CharField(source='organization_display') length = serializers.FloatField(source='length_display') length_2d = serializers.FloatField(source='length_2d_display') @@ -86,7 +82,6 @@ class Meta(MapentityGeojsonModelSerializer.Meta): class WorkManagementEdgeSerializer(DynamicFieldsMixin, serializers.ModelSerializer): - checkbox = serializers.CharField(source='checkbox_display') organization = serializers.CharField(source='organization_display') length = serializers.FloatField(source='length_display') length_2d = serializers.FloatField(source='length_2d_display') diff --git a/geotrek/land/tests/test_views.py b/geotrek/land/tests/test_views.py index 9ccf46155a..2c358ea2f1 100644 --- a/geotrek/land/tests/test_views.py +++ b/geotrek/land/tests/test_views.py @@ -73,7 +73,7 @@ class PhysicalEdgeViewsTest(CommonTest): userfactory = PathManagerFactory get_expected_json_attrs = None # Disable API tests extra_column_list = ['eid'] - expected_column_list_extra = ['id', 'checkbox', 'physical_type', 'eid'] + expected_column_list_extra = ['id', 'physical_type', 'eid'] expected_column_formatlist_extra = ['id', 'physical_type', 'eid'] def get_good_data(self): @@ -88,8 +88,7 @@ def get_expected_datatables_attrs(self): 'id': self.obj.pk, 'length': round(self.obj.length, 1), 'physical_type': self.obj.physical_type_display, - 'length_2d': round(self.obj.length, 1), - 'checkbox': self.obj.checkbox_display + 'length_2d': round(self.obj.length, 1) } @@ -100,7 +99,7 @@ class LandEdgeViewsTest(CommonTest): userfactory = PathManagerFactory get_expected_json_attrs = None # Disable API tests extra_column_list = ['owner', 'agreement'] - expected_column_list_extra = ['id', 'checkbox', 'land_type', 'owner', 'agreement'] + expected_column_list_extra = ['id', 'land_type', 'owner', 'agreement'] expected_column_formatlist_extra = ['id', 'owner', 'agreement'] def get_good_data(self): @@ -115,8 +114,7 @@ def get_expected_datatables_attrs(self): 'id': self.obj.pk, 'land_type': self.obj.land_type_display, 'length': round(self.obj.length, 1), - 'length_2d': round(self.obj.length, 1), - 'checkbox': self.obj.checkbox_display + 'length_2d': round(self.obj.length, 1) } @@ -127,7 +125,7 @@ class CompetenceEdgeViewsTest(CommonTest): userfactory = PathManagerFactory get_expected_json_attrs = None # Disable API tests extra_column_list = ['eid'] - expected_column_list_extra = ['id', 'checkbox', 'organization', 'eid'] + expected_column_list_extra = ['id', 'organization', 'eid'] expected_column_formatlist_extra = ['id', 'organization', 'eid'] def get_good_data(self): @@ -142,8 +140,7 @@ def get_expected_datatables_attrs(self): 'id': self.obj.pk, 'length': round(self.obj.length, 1), 'organization': self.obj.organization_display, - 'length_2d': round(self.obj.length, 1), - 'checkbox': self.obj.checkbox_display + 'length_2d': round(self.obj.length, 1) } @@ -154,7 +151,7 @@ class WorkManagementEdgeViewsTest(CommonTest): userfactory = PathManagerFactory get_expected_json_attrs = None # Disable API tests extra_column_list = ['eid'] - expected_column_list_extra = ['id', 'checkbox', 'organization', 'eid'] + expected_column_list_extra = ['id', 'organization', 'eid'] expected_column_formatlist_extra = ['id', 'organization', 'eid'] def get_good_data(self): @@ -169,8 +166,7 @@ def get_expected_datatables_attrs(self): 'id': self.obj.pk, 'length': round(self.obj.length, 1), 'organization': self.obj.organization_display, - 'length_2d': round(self.obj.length, 1), - 'checkbox': self.obj.checkbox_display + 'length_2d': round(self.obj.length, 1) } @@ -181,7 +177,7 @@ class SignageManagementEdgeViewsTest(CommonTest): userfactory = PathManagerFactory get_expected_json_attrs = None # Disable API tests extra_column_list = ['eid'] - expected_column_list_extra = ['id', 'checkbox', 'organization', 'eid'] + expected_column_list_extra = ['id', 'organization', 'eid'] expected_column_formatlist_extra = ['id', 'organization', 'eid'] def get_good_data(self): @@ -196,6 +192,5 @@ def get_expected_datatables_attrs(self): 'id': self.obj.pk, 'length': round(self.obj.length, 1), 'organization': self.obj.organization_display, - 'length_2d': round(self.obj.length, 1), - 'checkbox': self.obj.checkbox_display + 'length_2d': round(self.obj.length, 1) } diff --git a/geotrek/land/views.py b/geotrek/land/views.py index 2bb2215682..96e1584a91 100644 --- a/geotrek/land/views.py +++ b/geotrek/land/views.py @@ -21,9 +21,8 @@ class PhysicalEdgeList(CustomColumnsMixin, CreateFromTopologyMixin, MapEntityList): queryset = PhysicalEdge.objects.existing() filterform = PhysicalEdgeFilterSet - mandatory_columns = ['id', 'checkbox', 'physical_type'] + mandatory_columns = ['id', 'physical_type'] default_extra_columns = ['length', 'length_2d'] - unorderable_columns = ['checkbox'] class PhysicalEdgeFormatList(MapEntityFormat, PhysicalEdgeList): @@ -80,9 +79,8 @@ def get_queryset(self): class LandEdgeList(CustomColumnsMixin, MapEntityList): queryset = LandEdge.objects.existing() filterform = LandEdgeFilterSet - mandatory_columns = ['id', 'checkbox', 'land_type'] + mandatory_columns = ['id', 'land_type'] default_extra_columns = ['length', 'length_2d'] - unorderable_columns = ['checkbox'] class LandEdgeFormatList(MapEntityFormat, LandEdgeList): @@ -137,9 +135,8 @@ def get_queryset(self): class CompetenceEdgeList(CustomColumnsMixin, MapEntityList): queryset = CompetenceEdge.objects.existing() filterform = CompetenceEdgeFilterSet - mandatory_columns = ['id', 'checkbox', 'organization'] + mandatory_columns = ['id', 'organization'] default_extra_columns = ['length', 'length_2d'] - unorderable_columns = ['checkbox'] class CompetenceEdgeFormatList(MapEntityFormat, CompetenceEdgeList): @@ -194,9 +191,8 @@ def get_queryset(self): class WorkManagementEdgeList(CustomColumnsMixin, MapEntityList): queryset = WorkManagementEdge.objects.existing() filterform = WorkManagementEdgeFilterSet - mandatory_columns = ['id', 'checkbox', 'organization'] + mandatory_columns = ['id', 'organization'] default_extra_columns = ['length', 'length_2d'] - unorderable_columns = ['checkbox'] class WorkManagementEdgeFormatList(MapEntityFormat, WorkManagementEdgeList): @@ -250,9 +246,8 @@ def get_queryset(self): class SignageManagementEdgeList(CustomColumnsMixin, MapEntityList): queryset = SignageManagementEdge.objects.existing() filterform = SignageManagementEdgeFilterSet - mandatory_columns = ['id', 'checkbox', 'organization'] + mandatory_columns = ['id', 'organization'] default_extra_columns = ['length', 'length_2d'] - unorderable_columns = ['checkbox'] class SignageManagementEdgeFormatList(MapEntityFormat, SignageManagementEdgeList): diff --git a/geotrek/maintenance/serializers.py b/geotrek/maintenance/serializers.py index 1f3c7bf86a..471ac2e7ef 100644 --- a/geotrek/maintenance/serializers.py +++ b/geotrek/maintenance/serializers.py @@ -6,7 +6,6 @@ class InterventionSerializer(DynamicFieldsMixin, serializers.ModelSerializer): - checkbox = serializers.CharField(source='checkbox_display') name = serializers.CharField(source='name_display') stake = serializers.SlugRelatedField(slug_field='stake', read_only=True) status = serializers.SlugRelatedField(slug_field='status', read_only=True) diff --git a/geotrek/maintenance/tests/test_views.py b/geotrek/maintenance/tests/test_views.py index 7ffb820dd1..c9cfc39c52 100644 --- a/geotrek/maintenance/tests/test_views.py +++ b/geotrek/maintenance/tests/test_views.py @@ -45,7 +45,7 @@ class InterventionViewsTest(CommonTest): userfactory = PathManagerFactory get_expected_json_attrs = None # Disable API tests extra_column_list = ['heliport_cost', 'subcontract_cost', 'disorders', 'jobs'] - expected_column_list_extra = ['id', 'checkbox', 'name', 'heliport_cost', 'subcontract_cost', 'disorders', 'jobs'] + expected_column_list_extra = ['id', 'name', 'heliport_cost', 'subcontract_cost', 'disorders', 'jobs'] expected_column_formatlist_extra = ['id', 'heliport_cost', 'subcontract_cost', 'disorders', 'jobs'] def get_bad_data(self): @@ -104,8 +104,7 @@ def get_expected_datatables_attrs(self): 'stake': self.obj.stake.stake, 'status': self.obj.status.status, 'type': self.obj.type.type, - 'target': self.obj.target_display, - 'checkbox': self.obj.checkbox_display + 'target': self.obj.target_display } def test_creation_form_on_signage(self): diff --git a/geotrek/maintenance/views.py b/geotrek/maintenance/views.py index e616278e8e..c597e63aef 100755 --- a/geotrek/maintenance/views.py +++ b/geotrek/maintenance/views.py @@ -25,10 +25,9 @@ class InterventionList(CustomColumnsMixin, MapEntityList): queryset = Intervention.objects.existing() filterform = InterventionFilterSet - mandatory_columns = ['id', 'checkbox', 'name'] + mandatory_columns = ['id', 'name'] default_extra_columns = ['date', 'type', 'target', 'status', 'stake'] searchable_columns = ['id', 'name'] - unorderable_columns = ['checkbox'] class InterventionFormatList(MapEntityFormat, InterventionList): diff --git a/geotrek/outdoor/serializers.py b/geotrek/outdoor/serializers.py index 3b722c440d..920c0927b9 100644 --- a/geotrek/outdoor/serializers.py +++ b/geotrek/outdoor/serializers.py @@ -33,7 +33,6 @@ class Meta: class SiteSerializer(DynamicFieldsMixin, serializers.ModelSerializer): - checkbox = serializers.CharField(source='checkbox_display') name = serializers.CharField(source='name_display') super_practices = serializers.CharField(source='super_practices_display') structure = serializers.SlugRelatedField('name', read_only=True) @@ -81,7 +80,6 @@ class Meta(SiteAPISerializer.Meta): class CourseSerializer(DynamicFieldsMixin, serializers.ModelSerializer): - checkbox = serializers.CharField(source='checkbox_display') structure = serializers.SlugRelatedField('name', read_only=True) parent_sites = serializers.CharField(source='parent_sites_display') name = serializers.CharField(source='name_display') diff --git a/geotrek/outdoor/tests/test_functional.py b/geotrek/outdoor/tests/test_functional.py index 195196bea2..47b90983d3 100644 --- a/geotrek/outdoor/tests/test_functional.py +++ b/geotrek/outdoor/tests/test_functional.py @@ -84,7 +84,6 @@ def get_expected_datatables_attrs(self): return { 'date_update': '17/03/2020 00:00:00', 'id': self.obj.pk, - 'checkbox': self.obj.checkbox_display, 'name': self.obj.name_display, 'super_practices': self.obj.super_practices_display } @@ -95,7 +94,7 @@ def test_custom_columns_mixin_on_list(self): return with override_settings(COLUMNS_LISTS={f'outdoor_{self.model._meta.model_name}_view': self.extra_column_list}): self.assertEqual(import_string(f'geotrek.{self.model._meta.app_label}.views.{self.model.__name__}List')().columns, - ['id', 'checkbox', 'name', 'orientation', 'ratings', 'period']) + ['id', 'name', 'orientation', 'ratings', 'period']) def test_custom_columns_mixin_on_export(self): # Assert columns equal mandatory columns plus custom extra columns @@ -157,7 +156,6 @@ def get_expected_datatables_attrs(self): return { 'date_update': '17/03/2020 00:00:00', 'id': self.obj.pk, - 'checkbox': self.obj.checkbox_display, 'name': self.obj.name_display, 'parent_sites': self.obj.parent_sites_display, } @@ -182,7 +180,7 @@ def test_custom_columns_mixin_on_list(self): return with override_settings(COLUMNS_LISTS={f'outdoor_{self.model._meta.model_name}_view': self.extra_column_list}): self.assertEqual(import_string(f'geotrek.{self.model._meta.app_label}.views.{self.model.__name__}List')().columns, - ['id', 'checkbox', 'name', 'equipment', 'ratings', 'eid']) + ['id', 'name', 'equipment', 'ratings', 'eid']) def test_custom_columns_mixin_on_export(self): # Assert columns equal mandatory columns plus custom extra columns diff --git a/geotrek/outdoor/views.py b/geotrek/outdoor/views.py index f1ae79403c..48a592c5e9 100644 --- a/geotrek/outdoor/views.py +++ b/geotrek/outdoor/views.py @@ -21,10 +21,9 @@ class SiteList(CustomColumnsMixin, MapEntityList): queryset = Site.objects.all() filterform = SiteFilterSet - mandatory_columns = ['id', 'checkbox', 'name'] + mandatory_columns = ['id', 'name'] default_extra_columns = ['super_practices', 'date_update'] searchable_columns = ['id', 'name'] - unorderable_columns = ['checkbox'] class SiteDetail(DuplicateDetailMixin, CompletenessMixin, MapEntityDetail): @@ -143,10 +142,9 @@ def get_queryset(self): class CourseList(CustomColumnsMixin, MapEntityList): queryset = Course.objects.select_related('type').prefetch_related('parent_sites').all() filterform = CourseFilterSet - mandatory_columns = ['id', 'checkbox', 'name'] + mandatory_columns = ['id', 'name'] default_extra_columns = ['parent_sites', 'date_update'] searchable_columns = ['id', 'name'] - unorderable_columns = ['checkbox'] class CourseDetail(DuplicateDetailMixin, CompletenessMixin, MapEntityDetail): diff --git a/geotrek/sensitivity/serializers.py b/geotrek/sensitivity/serializers.py index 69493c9b20..fb16419fd2 100644 --- a/geotrek/sensitivity/serializers.py +++ b/geotrek/sensitivity/serializers.py @@ -29,7 +29,6 @@ class Meta: class SensitiveAreaSerializer(DynamicFieldsMixin, rest_serializers.ModelSerializer): - checkbox = rest_serializers.CharField(source='checkbox_display') category = rest_serializers.CharField(source='category_display') structure = rest_serializers.SlugRelatedField('name', read_only=True) species = rest_serializers.CharField(source='species_display') diff --git a/geotrek/sensitivity/tests/test_functional.py b/geotrek/sensitivity/tests/test_functional.py index 236818d828..ebc549c270 100644 --- a/geotrek/sensitivity/tests/test_functional.py +++ b/geotrek/sensitivity/tests/test_functional.py @@ -44,7 +44,6 @@ def get_expected_datatables_attrs(self): 'category': self.obj.category_display, 'id': self.obj.pk, 'species': self.obj.species_display, - 'checkbox': self.obj.checkbox_display, } def setUp(self): @@ -69,7 +68,7 @@ def test_custom_columns_mixin_on_list(self): return with override_settings(COLUMNS_LISTS={'sensitivity_view': self.extra_column_list}): self.assertEqual(import_string(f'geotrek.{self.model._meta.app_label}.views.{self.model.__name__}List')().columns, - ['id', 'checkbox', 'species', 'description', 'contact']) + ['id', 'species', 'description', 'contact']) def test_custom_columns_mixin_on_export(self): # Assert columns equal mandatory columns plus custom extra columns @@ -115,7 +114,6 @@ def get_expected_datatables_attrs(self): 'category': self.obj.category_display, 'id': self.obj.pk, 'species': self.obj.species_display, - 'checkbox': self.obj.checkbox_display, } def setUp(self): @@ -184,7 +182,7 @@ def test_custom_columns_mixin_on_list(self): return with override_settings(COLUMNS_LISTS={'sensitivity_view': self.extra_column_list}): self.assertEqual(import_string(f'geotrek.{self.model._meta.app_label}.views.{self.model.__name__}List')().columns, - ['id', 'checkbox', 'species', 'description', 'contact']) + ['id', 'species', 'description', 'contact']) def test_custom_columns_mixin_on_export(self): # Assert columns equal mandatory columns plus custom extra columns diff --git a/geotrek/sensitivity/views.py b/geotrek/sensitivity/views.py index 43f05cabbd..d9a6c18ffe 100644 --- a/geotrek/sensitivity/views.py +++ b/geotrek/sensitivity/views.py @@ -36,9 +36,8 @@ class SensitiveAreaList(CustomColumnsMixin, MapEntityList): queryset = SensitiveArea.objects.existing() filterform = SensitiveAreaFilterSet - mandatory_columns = ['id', 'checkbox', 'species'] + mandatory_columns = ['id', 'species'] default_extra_columns = ['category'] - unorderable_columns = ['checkbox'] class SensitiveAreaFormatList(MapEntityFormat, SensitiveAreaList): diff --git a/geotrek/signage/serializers.py b/geotrek/signage/serializers.py index d38a8f04a1..ced79f0fe5 100644 --- a/geotrek/signage/serializers.py +++ b/geotrek/signage/serializers.py @@ -21,7 +21,6 @@ class Meta: class SignageSerializer(DynamicFieldsMixin, BasePublishableSerializerMixin, serializers.ModelSerializer): - checkbox = serializers.CharField(source='checkbox_display') name = serializers.CharField(source='name_display') structure = serializers.SlugRelatedField('name', read_only=True) type = serializers.CharField(source='type_display') diff --git a/geotrek/signage/tests/test_views.py b/geotrek/signage/tests/test_views.py index 567df25e1e..6b6109b79e 100755 --- a/geotrek/signage/tests/test_views.py +++ b/geotrek/signage/tests/test_views.py @@ -202,7 +202,7 @@ class SignageViewsTest(GeotrekAPITestCase, CommonTest): userfactory = PathManagerFactory expected_json_geom = {'type': 'Point', 'coordinates': [3.0, 46.5]} extra_column_list = ['type', 'eid'] - expected_column_list_extra = ['id', 'checkbox', 'name', 'type', 'eid'] + expected_column_list_extra = ['id', 'name', 'type', 'eid'] expected_column_formatlist_extra = ['id', 'type', 'eid'] def get_expected_json_attrs(self): @@ -235,8 +235,7 @@ def get_expected_datatables_attrs(self): 'condition': self.obj.condition.label, 'id': self.obj.pk, 'name': self.obj.name_display, - 'type': self.obj.type.label, - 'checkbox': self.obj.checkbox_display, + 'type': self.obj.type.label } def get_good_data(self): diff --git a/geotrek/signage/views.py b/geotrek/signage/views.py index 5225d5d347..dbf580e019 100755 --- a/geotrek/signage/views.py +++ b/geotrek/signage/views.py @@ -31,10 +31,9 @@ class LineMixin(FormsetMixin): class SignageList(CustomColumnsMixin, MapEntityList): queryset = Signage.objects.existing() filterform = SignageFilterSet - mandatory_columns = ['id', 'checkbox', 'name'] + mandatory_columns = ['id', 'name'] default_extra_columns = ['code', 'type', 'condition'] searchable_columns = ['id', 'name', 'code'] - unorderable_columns = ['checkbox'] class SignageFormatList(MapEntityFormat, SignageList): diff --git a/geotrek/tourism/serializers.py b/geotrek/tourism/serializers.py index 07a9d6d578..22e3d4ab30 100644 --- a/geotrek/tourism/serializers.py +++ b/geotrek/tourism/serializers.py @@ -86,7 +86,6 @@ def get_slug(self, obj): class TouristicContentSerializer(DynamicFieldsMixin, rest_serializers.ModelSerializer): - checkbox = rest_serializers.CharField(source='checkbox_display') name = rest_serializers.CharField(source='name_display') structure = rest_serializers.SlugRelatedField('name', read_only=True) themes = rest_serializers.CharField(source='themes_display') @@ -161,7 +160,6 @@ class Meta: class TouristicEventSerializer(DynamicFieldsMixin, rest_serializers.ModelSerializer): - checkbox = rest_serializers.CharField(source='checkbox_display') name = rest_serializers.CharField(source='name_display') type = rest_serializers.SlugRelatedField('type', read_only=True) structure = rest_serializers.SlugRelatedField('name', read_only=True) diff --git a/geotrek/tourism/tests/test_functional.py b/geotrek/tourism/tests/test_functional.py index 6db1e5b9d1..37af469c84 100644 --- a/geotrek/tourism/tests/test_functional.py +++ b/geotrek/tourism/tests/test_functional.py @@ -107,8 +107,7 @@ def get_expected_datatables_attrs(self): return { 'category': self.obj.category.label, 'id': self.obj.pk, - 'name': self.obj.name_display, - 'checkbox': self.obj.checkbox_display, + 'name': self.obj.name_display } def get_bad_data(self): @@ -147,7 +146,7 @@ def test_custom_columns_mixin_on_list(self): return with override_settings(COLUMNS_LISTS={'touristic_content_view': self.extra_column_list}): self.assertEqual(import_string(f'geotrek.{self.model._meta.app_label}.views.{self.model.__name__}List')().columns, - ['id', 'checkbox', 'name', 'type1', 'type2', 'eid']) + ['id', 'name', 'type1', 'type2', 'eid']) def test_custom_columns_mixin_on_export(self): # Assert columns equal mandatory columns plus custom extra columns @@ -244,8 +243,7 @@ def get_expected_datatables_attrs(self): 'end_date': '22/02/2202', 'id': self.obj.pk, 'name': self.obj.name_display, - 'type': self.obj.type.type, - 'checkbox': self.obj.checkbox_display, + 'type': self.obj.type.type } def get_bad_data(self): @@ -283,7 +281,7 @@ def test_custom_columns_mixin_on_list(self): return with override_settings(COLUMNS_LISTS={'touristic_event_view': self.extra_column_list}): self.assertEqual(import_string(f'geotrek.{self.model._meta.app_label}.views.{self.model.__name__}List')().columns, - ['id', 'checkbox', 'name', 'type', 'eid', 'themes']) + ['id', 'name', 'type', 'eid', 'themes']) def test_custom_columns_mixin_on_export(self): # Assert columns equal mandatory columns plus custom extra columns diff --git a/geotrek/tourism/views.py b/geotrek/tourism/views.py index f20005390b..02f00e52cf 100644 --- a/geotrek/tourism/views.py +++ b/geotrek/tourism/views.py @@ -43,10 +43,9 @@ class TouristicContentList(CustomColumnsMixin, MapEntityList): queryset = TouristicContent.objects.existing() filterform = TouristicContentFilterSet - mandatory_columns = ['id', 'checkbox', 'name'] + mandatory_columns = ['id', 'name'] default_extra_columns = ['category'] searchable_columns = ['id', 'name'] - unorderable_columns = ['checkbox'] @property def categories_list(self): @@ -195,10 +194,9 @@ def get_queryset(self): class TouristicEventList(CustomColumnsMixin, MapEntityList): queryset = TouristicEvent.objects.existing() filterform = TouristicEventFilterSet - mandatory_columns = ['id', 'checkbox', 'name'] + mandatory_columns = ['id', 'name'] default_extra_columns = ['type', 'begin_date', 'end_date'] searchable_columns = ['id', 'name'] - unorderable_columns = ['checkbox'] class TouristicEventFormatList(MapEntityFormat, TouristicEventList): diff --git a/geotrek/trekking/serializers.py b/geotrek/trekking/serializers.py index 5aa5de25d5..1196f64d3d 100644 --- a/geotrek/trekking/serializers.py +++ b/geotrek/trekking/serializers.py @@ -142,7 +142,6 @@ class Meta: class TrekSerializer(DynamicFieldsMixin, serializers.ModelSerializer): - checkbox = serializers.CharField(source='checkbox_display') length_2d = serializers.ReadOnlyField() name = serializers.CharField(source='name_display') difficulty = serializers.SlugRelatedField('difficulty', read_only=True) @@ -342,7 +341,6 @@ class Meta: class POISerializer(DynamicFieldsMixin, serializers.ModelSerializer): - checkbox = serializers.CharField(source='checkbox_display') name = serializers.CharField(source='name_display') type = serializers.CharField(source='type_display') thumbnail = serializers.CharField(source='thumbnail_display') @@ -389,7 +387,6 @@ class Meta: class ServiceSerializer(DynamicFieldsMixin, serializers.ModelSerializer): - checkbox = serializers.CharField(source='checkbox_display') name = serializers.CharField(source='name_display') type = serializers.CharField(source='type_display') diff --git a/geotrek/trekking/tests/test_views.py b/geotrek/trekking/tests/test_views.py index 11ae773c83..9b20d4bc91 100755 --- a/geotrek/trekking/tests/test_views.py +++ b/geotrek/trekking/tests/test_views.py @@ -25,8 +25,8 @@ from geotrek.authent.tests.factories import TrekkingManagerFactory, StructureFactory, UserProfileFactory from geotrek.common.templatetags import geotrek_tags from geotrek.common.tests import CommonTest, CommonLiveTest, TranslationResetMixin, GeotrekAPITestCase -from geotrek.common.tests.factories import (AttachmentFactory, ThemeFactory, LabelFactory, - RecordSourceFactory, TargetPortalFactory) +from geotrek.common.tests.factories import (AttachmentFactory, AttachmentAccessibilityFactory, + ThemeFactory, LabelFactory, RecordSourceFactory, TargetPortalFactory) from geotrek.common.utils.testdata import get_dummy_uploaded_image from geotrek.core.tests.factories import PathFactory from geotrek.infrastructure.models import Infrastructure @@ -53,7 +53,7 @@ class POIViewsTest(GeotrekAPITestCase, CommonTest): userfactory = TrekkingManagerFactory expected_json_geom = {'type': 'Point', 'coordinates': [3.0, 46.5]} extra_column_list = ['type', 'eid'] - expected_column_list_extra = ['id', 'checkbox', 'name', 'type', 'eid'] + expected_column_list_extra = ['id', 'name', 'type', 'eid'] expected_column_formatlist_extra = ['id', 'type', 'eid'] def get_expected_json_attrs(self): @@ -92,7 +92,6 @@ def get_expected_json_attrs(self): def get_expected_datatables_attrs(self): return { 'id': self.obj.pk, - 'checkbox': self.obj.checkbox_display, 'name': self.obj.name_display, 'thumbnail': 'None', 'type': self.obj.type.label @@ -218,7 +217,7 @@ class TrekViewsTest(GeotrekAPITestCase, CommonTest): userfactory = TrekkingManagerFactory expected_json_geom = {'type': 'LineString', 'coordinates': [[3.0, 46.5], [3.001304, 46.5009004]]} extra_column_list = ['type', 'eid'] - expected_column_list_extra = ['id', 'checkbox', 'name', 'type', 'eid'] + expected_column_list_extra = ['id', 'name', 'type', 'eid'] expected_column_formatlist_extra = ['id', 'name', 'type', 'eid'] length = 141.42135623731 @@ -340,7 +339,6 @@ def get_expected_datatables_attrs(self): 'id': self.obj.pk, 'name': self.obj.name_display, 'thumbnail': 'None', - 'checkbox': self.obj.checkbox_display } def get_bad_data(self): @@ -1422,7 +1420,7 @@ class ServiceViewsTest(GeotrekAPITestCase, CommonTest): userfactory = TrekkingManagerFactory expected_json_geom = {'type': 'Point', 'coordinates': [3.0, 46.5]} extra_column_list = ['type', 'eid'] - expected_column_list_extra = ['id', 'checkbox', 'name', 'type', 'eid'] + expected_column_list_extra = ['id', 'name', 'type', 'eid'] expected_column_formatlist_extra = ['id', 'type', 'eid'] def get_expected_json_attrs(self): @@ -1442,7 +1440,6 @@ def get_expected_datatables_attrs(self): return { 'id': self.obj.pk, 'name': self.obj.name_display, - 'checkbox': self.obj.checkbox_display } def get_good_data(self): diff --git a/geotrek/trekking/views.py b/geotrek/trekking/views.py index 9ec860d645..467a996543 100755 --- a/geotrek/trekking/views.py +++ b/geotrek/trekking/views.py @@ -58,9 +58,9 @@ def get_queryset(self): class TrekList(CustomColumnsMixin, FlattenPicturesMixin, MapEntityList): filterform = TrekFilterSet queryset = Trek.objects.existing() - mandatory_columns = ['id', 'checkbox', 'name'] + mandatory_columns = ['id', 'name'] default_extra_columns = ['duration', 'difficulty', 'departure', 'thumbnail'] - unorderable_columns = ['thumbnail', 'checkbox'] + unorderable_columns = ['thumbnail'] searchable_columns = ['id', 'name', 'departure', 'arrival'] @@ -288,9 +288,9 @@ def get_queryset(self): class POIList(CustomColumnsMixin, FlattenPicturesMixin, MapEntityList): queryset = POI.objects.existing() filterform = POIFilterSet - mandatory_columns = ['id', 'checkbox', 'name'] + mandatory_columns = ['id', 'name'] default_extra_columns = ['type', 'thumbnail'] - unorderable_columns = ['thumbnail', 'checkbox'] + unorderable_columns = ['thumbnail'] searchable_columns = ['id', 'name', ] @@ -454,10 +454,9 @@ def get_queryset(self): class ServiceList(CustomColumnsMixin, MapEntityList): queryset = Service.objects.existing() filterform = ServiceFilterSet - mandatory_columns = ['id', 'checkbox', 'name'] + mandatory_columns = ['id', 'name'] default_extra_columns = [] searchable_columns = ['id', 'name'] - unorderable_columns = ['checkbox'] class ServiceFormatList(MapEntityFormat, ServiceList):