Skip to content
Snippets Groups Projects
Commit 5c749971 authored by Timothee P's avatar Timothee P :sunflower:
Browse files

Merge branch 'develop' into redmine-issues/12721

parents 287cb0cf f5882f47
No related branches found
No related tags found
No related merge requests found
...@@ -27,6 +27,18 @@ server { ...@@ -27,6 +27,18 @@ server {
proxy_pass http://geocontrib_site; proxy_pass http://geocontrib_site;
} }
location /geocontrib/cas {
proxy_pass_header Set-Cookie;
proxy_set_header X-NginX-Proxy true;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Host $host;
proxy_read_timeout 300s;
proxy_redirect off;
proxy_pass http://geocontrib_site;
}
location /geocontrib/admin { location /geocontrib/admin {
proxy_pass_header Set-Cookie; proxy_pass_header Set-Cookie;
proxy_set_header X-NginX-Proxy true; proxy_set_header X-NginX-Proxy true;
......
...@@ -319,9 +319,15 @@ const mapUtil = { ...@@ -319,9 +319,15 @@ const mapUtil = {
customFieldOption = properties[customField[0]]; customFieldOption = properties[customField[0]];
} }
let defaultStyle; const hiddenStyle = ({
let hiddenStyle; radius: 0,
fillOpacity: 0.5,
weight: 0,
fill: false,
color: featureType.color,
});
let defaultStyle;
if ( if (
featureType.colors_style.value.icons[customFieldOption] && featureType.colors_style.value.icons[customFieldOption] &&
featureType.colors_style.value.icons[customFieldOption] !== 'circle' featureType.colors_style.value.icons[customFieldOption] !== 'circle'
...@@ -342,10 +348,6 @@ const mapUtil = { ...@@ -342,10 +348,6 @@ const mapUtil = {
icon: customMapIcon icon: customMapIcon
}; };
hiddenStyle = ({
icon: customMapIcon
});
} else { } else {
defaultStyle = { defaultStyle = {
...@@ -355,15 +357,7 @@ const mapUtil = { ...@@ -355,15 +357,7 @@ const mapUtil = {
fill: true, fill: true,
color: color, color: color,
}; };
hiddenStyle = ({
radius: 0,
fillOpacity: 0.5,
weight: 0,
fill: false,
color: featureType.color,
});
} }
// Filtre sur le feature type // Filtre sur le feature type
......
...@@ -11,12 +11,12 @@ if (workbox) { ...@@ -11,12 +11,12 @@ if (workbox) {
//workbox.core.skipWaiting(); //workbox.core.skipWaiting();
// Make sure to return a specific response for all navigation requests. // Make sure to return a specific response for all navigation requests.
// Since we have a SPA here, this should be index.html always. // Since we have a SPA here, this should be index.html always.
// https://stackoverflow.com/questions/49963982/vue-router-history-mode-with-pwa-in-offline-mode // https://stackoverflow.com/questions/49963982/vue-router-history-mode-with-pwa-in-offline-mode
workbox.routing.registerNavigationRoute('/geocontrib/index.html', { workbox.routing.registerNavigationRoute('/geocontrib/index.html', {
blacklist: [/\/api/,/\/admin/,/\/media/], blacklist: [/\/api/,/\/admin/,/\/media/,/\/cas/],
}); })
workbox.routing.registerRoute( workbox.routing.registerRoute(
new RegExp('.*/config/config.json'), new RegExp('.*/config/config.json'),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment