Bugfix enabling organization admin to add new weather station

src/main/java/no/nibio/vips/logic/controller/servlet/PointOfInterestController.java

@@ -361,6 +361,7 @@ public class PointOfInterestController extends HttpServlet {
                             request.setAttribute("weatherStation", weatherStation);
                             request.setAttribute("defaultMapCenter",user.getOrganizationId().getDefaultMapCenter());
                             request.setAttribute("defaultMapZoom", user.getOrganizationId().getDefaultMapZoom());
+                            request.setAttribute("returnURL","weatherStation?organizationId=" + user.getOrganizationId().getOrganizationId());
                             request.getSession().setAttribute("dataSources", SessionControllerGetter.getPointOfInterestBean().getWeatherStationDataSources());
                             request.getSession().setAttribute("availableTimeZones", Globals.availableTimeZones);
                             request.getSession().setAttribute("defaultTimeZoneId", user.getOrganizationId().getDefaultTimeZone());

src/main/webapp/public/nordic_septoria_whs/nordic_septoria_whs.js

@@ -252,6 +252,12 @@ var loadScript = function(url, callback)
     document.head.appendChild(script);
 };
 
+/**
+ * Loads elements (e.g. script elements) into the parent page
+ * @param {type} type the type of element
+ * @param {type} attributes the attributes (like src) of the element
+ * @param {type} callback What do do after the loading is done
+ */
 var loadHeadElement = function(type, attributes, callback)
 {
     var elm = document.createElement(type);

src/main/webapp/templates/weatherstationForm.ftl

@@ -164,6 +164,8 @@
 			     </select>
 			     <span class="help-block" id="${formId}_userId_validation"></span>
 			  </div>
+                          <#else>
+                          <input type="hidden" name="userId" value="<#if weatherStation.userId?has_content>${weatherStation.userId.userId}<#else>${user.userId}</#if>"/>
 			  </#if>
 			  <button type="submit" class="btn btn-default">${i18nBundle.submit}</button>
 			  <#if weatherStation.pointOfInterestId?has_content>