From 79f5e51513d3d4f88e4681b043def1e9da7922d0 Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Wed, 20 Feb 2013 13:15:31 -0300 Subject: [PATCH] Finish LDAP support. --- .../com/wisemapping/filter/RequestPropertiesInterceptor.java | 4 ++++ wise-webapp/src/main/webapp/jsp/accountSettings.jsp | 2 ++ wise-webapp/src/main/webapp/jsp/login.jsp | 3 +++ 3 files changed, 9 insertions(+) diff --git a/wise-webapp/src/main/java/com/wisemapping/filter/RequestPropertiesInterceptor.java b/wise-webapp/src/main/java/com/wisemapping/filter/RequestPropertiesInterceptor.java index 1b69ae16..fff6c46e 100644 --- a/wise-webapp/src/main/java/com/wisemapping/filter/RequestPropertiesInterceptor.java +++ b/wise-webapp/src/main/java/com/wisemapping/filter/RequestPropertiesInterceptor.java @@ -42,6 +42,8 @@ public class RequestPropertiesInterceptor extends HandlerInterceptorAdapter { @Value("${site.baseurl}") private String siteUrl; + @Value("${security.type}") + private String securityType; public boolean preHandle(@NotNull HttpServletRequest request, @NotNull HttpServletResponse response, Object object) throws Exception { @@ -49,6 +51,8 @@ public class RequestPropertiesInterceptor extends HandlerInterceptorAdapter { request.setAttribute("google.analytics.account", analyticsAccount); request.setAttribute("google.ads.enabled", adsEnabled); request.setAttribute("site.homepage", siteHomepage); + request.setAttribute("security.type", securityType); + // If the property could not be resolved, try to infer one from the request... if ("${site.baseurl}".equals(siteUrl)) { diff --git a/wise-webapp/src/main/webapp/jsp/accountSettings.jsp b/wise-webapp/src/main/webapp/jsp/accountSettings.jsp index 1923ffa1..9e6e69df 100755 --- a/wise-webapp/src/main/webapp/jsp/accountSettings.jsp +++ b/wise-webapp/src/main/webapp/jsp/accountSettings.jsp @@ -3,8 +3,10 @@
diff --git a/wise-webapp/src/main/webapp/jsp/login.jsp b/wise-webapp/src/main/webapp/jsp/login.jsp index faa8b76d..daecaa31 100644 --- a/wise-webapp/src/main/webapp/jsp/login.jsp +++ b/wise-webapp/src/main/webapp/jsp/login.jsp @@ -69,14 +69,17 @@
+ +
+