Compare commits
No commits in common. "e27a979a534984d9e28c803f227a1989336c0020" and "e87fe1531db8d3334948aaaf2f637acff65c9d35" have entirely different histories.
e27a979a53
...
e87fe1531d
5 changed files with 11 additions and 8 deletions
|
|
@ -372,7 +372,8 @@ document.addEventListener("DOMContentLoaded", function () {
|
||||||
container: mapDiv,
|
container: mapDiv,
|
||||||
style: window.MAP_STYLE_LIGHT,
|
style: window.MAP_STYLE_LIGHT,
|
||||||
center: window.MAP_DEFAULT_CENTER || [4.3572, 50.8477],
|
center: window.MAP_DEFAULT_CENTER || [4.3572, 50.8477],
|
||||||
zoom: 12
|
zoom: 12,
|
||||||
|
cooperativeGestures: true
|
||||||
});
|
});
|
||||||
|
|
||||||
map.addControl(new maplibregl.NavigationControl(), 'top-right');
|
map.addControl(new maplibregl.NavigationControl(), 'top-right');
|
||||||
|
|
|
||||||
|
|
@ -305,7 +305,8 @@ document.addEventListener("DOMContentLoaded", function () {
|
||||||
container: mapDiv,
|
container: mapDiv,
|
||||||
style: window.MAP_STYLE_LIGHT,
|
style: window.MAP_STYLE_LIGHT,
|
||||||
center: window.MAP_DEFAULT_CENTER || [4.3572, 50.8477],
|
center: window.MAP_DEFAULT_CENTER || [4.3572, 50.8477],
|
||||||
zoom: 12
|
zoom: 12,
|
||||||
|
cooperativeGestures: true
|
||||||
});
|
});
|
||||||
|
|
||||||
// 1. Fond de plan & Orthophotos (LayerSwitcherControl)
|
// 1. Fond de plan & Orthophotos (LayerSwitcherControl)
|
||||||
|
|
|
||||||
|
|
@ -238,7 +238,8 @@ document.addEventListener("DOMContentLoaded", function () {
|
||||||
container: mapDiv,
|
container: mapDiv,
|
||||||
style: window.MAP_STYLE_LIGHT,
|
style: window.MAP_STYLE_LIGHT,
|
||||||
center: window.MAP_DEFAULT_CENTER || [4.3572, 50.8477],
|
center: window.MAP_DEFAULT_CENTER || [4.3572, 50.8477],
|
||||||
zoom: 11
|
zoom: 11,
|
||||||
|
cooperativeGestures: true
|
||||||
});
|
});
|
||||||
|
|
||||||
map.addControl(new maplibregl.NavigationControl(), 'top-right');
|
map.addControl(new maplibregl.NavigationControl(), 'top-right');
|
||||||
|
|
|
||||||
|
|
@ -999,7 +999,7 @@ def observation_change_status(request, observation_id):
|
||||||
# Si passage en needs_info : publier aussi dans la discussion pour alerter l'auteur
|
# Si passage en needs_info : publier aussi dans la discussion pour alerter l'auteur
|
||||||
if new_status == 'needs_info':
|
if new_status == 'needs_info':
|
||||||
from notifications.services import get_or_create_observation_discussion, post_message
|
from notifications.services import get_or_create_observation_discussion, post_message
|
||||||
discussion, _created = get_or_create_observation_discussion(observation)
|
discussion, _ = get_or_create_observation_discussion(observation)
|
||||||
post_message(
|
post_message(
|
||||||
discussion=discussion,
|
discussion=discussion,
|
||||||
author=request.user,
|
author=request.user,
|
||||||
|
|
@ -1015,7 +1015,7 @@ def observation_change_status(request, observation_id):
|
||||||
_("Compléments d'information fournis. L'observation est à nouveau à traiter.")
|
_("Compléments d'information fournis. L'observation est à nouveau à traiter.")
|
||||||
)
|
)
|
||||||
from notifications.services import get_or_create_observation_discussion, post_message
|
from notifications.services import get_or_create_observation_discussion, post_message
|
||||||
discussion, _created = get_or_create_observation_discussion(observation)
|
discussion, _ = get_or_create_observation_discussion(observation)
|
||||||
post_message(
|
post_message(
|
||||||
discussion=discussion,
|
discussion=discussion,
|
||||||
author=request.user,
|
author=request.user,
|
||||||
|
|
@ -1281,7 +1281,7 @@ def observation_add(request, observation_id=None):
|
||||||
comment=_("Observation modifiée et renvoyée par l'auteur."),
|
comment=_("Observation modifiée et renvoyée par l'auteur."),
|
||||||
)
|
)
|
||||||
from notifications.services import get_or_create_observation_discussion, post_message
|
from notifications.services import get_or_create_observation_discussion, post_message
|
||||||
discussion, _created = get_or_create_observation_discussion(observation)
|
discussion, _ = get_or_create_observation_discussion(observation)
|
||||||
post_message(
|
post_message(
|
||||||
discussion=discussion,
|
discussion=discussion,
|
||||||
author=request.user,
|
author=request.user,
|
||||||
|
|
@ -2003,7 +2003,7 @@ def observation_add_message(request, observation_id):
|
||||||
reverse('observations:observation_detail', args=[observation_id]) + '#discussion'
|
reverse('observations:observation_detail', args=[observation_id]) + '#discussion'
|
||||||
)
|
)
|
||||||
|
|
||||||
discussion, _created = get_or_create_observation_discussion(observation)
|
discussion, _ = get_or_create_observation_discussion(observation)
|
||||||
|
|
||||||
files = request.FILES.getlist('attachments') or None
|
files = request.FILES.getlist('attachments') or None
|
||||||
post_message(discussion=discussion, author=request.user, content=content, files=files)
|
post_message(discussion=discussion, author=request.user, content=content, files=files)
|
||||||
|
|
|
||||||
|
|
@ -4502,7 +4502,7 @@ def preparation_order_add_message(request, pk):
|
||||||
next_url += '#discussion'
|
next_url += '#discussion'
|
||||||
return redirect(next_url)
|
return redirect(next_url)
|
||||||
|
|
||||||
discussion, _created = get_or_create_preparation_order_discussion(preparation_order)
|
discussion, _ = get_or_create_preparation_order_discussion(preparation_order)
|
||||||
files = request.FILES.getlist('attachments') or None
|
files = request.FILES.getlist('attachments') or None
|
||||||
post_message(discussion=discussion, author=request.user, content=content, files=files)
|
post_message(discussion=discussion, author=request.user, content=content, files=files)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue