Skip to content

Commit

Permalink
Merge pull request #3883 from GeotrekCE/all_intervention_display_on_p…
Browse files Browse the repository at this point in the history
…roject_map_issue_3878

Display only related project Intervention on map #3878
  • Loading branch information
juggler31 committed Jan 11, 2024
2 parents 2341bfd + 94aa803 commit 4572ce8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
4 changes: 1 addition & 3 deletions docs/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,8 @@ CHANGELOG
**Bug fixes**

- Extract all geometry types in views `v_outdoor_sites` and `v_outdoor_courses` (#3603)
- Display only related interventions on project detail map (#3878)
- Maintenance appears several times on some zoning filters (#3881)

**Bug fixes**

- Fix sub-language usage (en-US, zh-hant, ...) (#3801)


Expand Down
5 changes: 2 additions & 3 deletions geotrek/maintenance/templates/maintenance/project_detail.html
Original file line number Diff line number Diff line change
Expand Up @@ -102,14 +102,13 @@

//
// Load intervention layer filtered on project
var layer_url = "{% url 'maintenance:intervention-drf-list' %}?project={{ object.pk}}";
var layer_url = "{% url 'maintenance:intervention-drf-list' format='geojson' %}?project={{ object.pk}}";
var DETAIL_STYLE = L.Util.extend(window.SETTINGS.map.styles.detail, {clickable: true});

var layer = new L.ObjectsLayer(layer_url, {
style: DETAIL_STYLE,
objectUrl: interventionUrl,
onEachFeature: showInterventionLabel,
modelname: 'intervention',
});
layer.addTo(map);
layer.on('data:load', function (e) {
Expand All @@ -123,7 +122,7 @@

function interventionUrl(properties, layer) {
return window.SETTINGS.urls.detail.replace(new RegExp('modelname', 'g'), 'intervention')
.replace('0', properties.pk);
.replace('0', properties.id);
};
});
</script>
Expand Down

0 comments on commit 4572ce8

Please sign in to comment.