Skip to content
Snippets Groups Projects

Update with develop before real branch work starts

Merged Tor-Einar Skog requested to merge TE_SpotIT_wp34 into develop
2 files
+ 8
3
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -134,7 +134,7 @@ public class OrganizationController extends HttpServlet {
@@ -134,7 +134,7 @@ public class OrganizationController extends HttpServlet {
organization.setDefaultMapZoom(
organization.setDefaultMapZoom(
formValidation.getFormField("defaultMapZoom").isEmpty() ?
formValidation.getFormField("defaultMapZoom").isEmpty() ?
null
null
: formValidation.getFormField("defaultVipsCoreUserId").getValueAsInteger()
: formValidation.getFormField("defaultMapZoom").getValueAsInteger()
);
);
organization.setDefaultMapCenter(
organization.setDefaultMapCenter(
formValidation.getFormField("defaultMapCenter").isEmpty() || formValidation.getFormField("defaultMapCenter").getWebValue().trim().equals(",") ?
formValidation.getFormField("defaultMapCenter").isEmpty() || formValidation.getFormField("defaultMapCenter").getWebValue().trim().equals(",") ?
Loading