From 3250f00e2730e8e97fcce24f6275390265a9f374 Mon Sep 17 00:00:00 2001 From: Tor-Einar Skog <tor-einar.skog@nibio.no> Date: Fri, 16 Sep 2022 10:22:55 +0200 Subject: [PATCH] fix: Update user property name in Freemarker [VIPSUTV-303] --- src/main/webapp/templates/weatherstationView.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/templates/weatherstationView.ftl b/src/main/webapp/templates/weatherstationView.ftl index a8a2f271..8c9ca4ca 100755 --- a/src/main/webapp/templates/weatherstationView.ftl +++ b/src/main/webapp/templates/weatherstationView.ftl @@ -20,7 +20,7 @@ </#macro> <#macro custom_css> - <link rel="stylesheet" type="text/css" href="/css/3rdparty/ol.css"/ > + <link rel="stylesheet" type="text/css" href="/css/3rdparty/ol.css"/> </#macro> <#macro custom_js> <script type="text/javascript" src="/js/3rdparty/ol.js"></script> @@ -36,7 +36,7 @@ // If weather station already registered, center on location // Otherwise, center and zoom to organizations's default <#if weatherStation.longitude?has_content && weatherStation.latitude?has_content> - initMap([${(weatherStation.longitude?c)!""},${(weatherStation.latitude?c)!""}],10,${weatherStation.userId.organizationId.organizationId},${weatherStation.pointOfInterestId!"null"}); + initMap([${(weatherStation.longitude?c)!""},${(weatherStation.latitude?c)!""}],10,${weatherStation.user.organizationId.organizationId},${weatherStation.pointOfInterestId!"null"}); <#else> initMap([${defaultMapCenter.x?c},${defaultMapCenter.y?c}],${defaultMapZoom},${user.organizationId.organizationId},${weatherStation.pointOfInterestId!"null"}); </#if> -- GitLab