Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🐛 fix intervention datatable list with interventions on lands #3455

Merged
merged 2 commits into from
Jan 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ CHANGELOG
**Bug fixes**

- Fix intervention datatable list if one intervention has no target

- Fix intervention datatable list with interventions on lands

**Development**

Expand Down
20 changes: 20 additions & 0 deletions geotrek/land/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ def color_index(self):
def name(self):
return self.physical_type_csv_display

@property
def name_display(self):
return self.physical_type_display

@property
def physical_type_display(self):
return '<a data-pk="%s" href="%s" >%s</a>' % (
Expand Down Expand Up @@ -127,6 +131,10 @@ def color_index(self):
def name(self):
return self.land_type_csv_display

@property
def name_display(self):
return self.land_type_display

@property
def land_type_display(self):
return '<a data-pk="%s" href="%s" >%s</a>' % (
Expand Down Expand Up @@ -178,6 +186,10 @@ def color_index(self):
def name(self):
return self.organization_csv_display

@property
def name_display(self):
return self.organization_display

@property
def organization_display(self):
return '<a data-pk="%s" href="%s" >%s</a>' % (
Expand Down Expand Up @@ -229,6 +241,10 @@ def color_index(self):
def name(self):
return self.organization_csv_display

@property
def name_display(self):
return self.organization_display

@property
def organization_display(self):
return '<a data-pk="%s" href="%s" >%s</a>' % (
Expand Down Expand Up @@ -280,6 +296,10 @@ def color_index(self):
def name(self):
return self.organization_csv_display

@property
def name_display(self):
return self.organization_display

@property
def organization_display(self):
return '<a data-pk="%s" href="%s" >%s</a>' % (
Expand Down
22 changes: 20 additions & 2 deletions geotrek/maintenance/tests/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@
from geotrek.core.tests.factories import PathFactory, TopologyFactory
from geotrek.infrastructure.models import Infrastructure
from geotrek.infrastructure.tests.factories import InfrastructureFactory
from geotrek.land.tests.factories import (PhysicalEdgeFactory, LandEdgeFactory,
CompetenceEdgeFactory, WorkManagementEdgeFactory,
SignageManagementEdgeFactory)
from geotrek.outdoor.tests.factories import CourseFactory
from geotrek.signage.tests.factories import BladeFactory, SignageFactory
from geotrek.signage.models import Signage
Expand Down Expand Up @@ -142,10 +145,20 @@ def test_detail_target_objects(self):
service = ServiceFactory.create(paths=[(path, .5, .5)])
topo = TopologyFactory.create(paths=[(path, .5, .5)])
topo.save()

land = LandEdgeFactory.create(paths=[(path, 0, .5)])
physical = PhysicalEdgeFactory.create(paths=[(path, 0, .5)])
competence = CompetenceEdgeFactory.create(paths=[(path, 0, .5)])
workmanagement = WorkManagementEdgeFactory.create(paths=[(path, 0, .5)])
signagemanagement = SignageManagementEdgeFactory.create(paths=[(path, 0, .5)])
intervention_land = InterventionFactory.create(target=land)
intervention_physical = InterventionFactory.create(target=physical)
intervention_competence = InterventionFactory.create(target=competence)
intervention_workmanagement = InterventionFactory.create(target=workmanagement)
intervention_signagemanagement = InterventionFactory.create(target=signagemanagement)
path_other = PathFactory.create(geom=LineString((10000, 0), (10010, 0)))
signa_other = SignageFactory.create(paths=[(path_other, .5, .5)])
signa_other.save()

else:
signa = SignageFactory.create(geom='SRID=2154;POINT (250 250)')
infrastructure = InfrastructureFactory.create(geom='SRID=2154;POINT (250 250)')
Expand Down Expand Up @@ -177,7 +190,12 @@ def test_detail_target_objects(self):
self.assertContains(response, intervention_service.target_display)
self.assertContains(response, intervention_blade.target_display)
self.assertContains(response, intervention_topo.target_display)

if settings.TREKKING_TOPOLOGY_ENABLED:
self.assertContains(response, intervention_land.target_display)
self.assertContains(response, intervention_physical.target_display)
self.assertContains(response, intervention_competence.target_display)
self.assertContains(response, intervention_workmanagement.target_display)
self.assertContains(response, intervention_signagemanagement.target_display)
self.assertNotContains(response, intervention_other.target_display)

def test_creation_form_on_signage_with_errors(self):
Expand Down