vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-11-22 14:17:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Finish LDAP support.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga 2013-02-20 13:15:31 -03:00
parent 0f605d89f0
commit 79f5e51513
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wise-webapp/src/main/java/com/wisemapping/filter/RequestPropertiesInterceptor.java
View File

@ -42,6 +42,8 @@ public class RequestPropertiesInterceptor extends HandlerInterceptorAdapter {
@Value("${site.baseurl}") @Value("${site.baseurl}")
private String siteUrl; private String siteUrl;
@Value("${security.type}")
private String securityType;
public boolean preHandle(@NotNull HttpServletRequest request, @NotNull HttpServletResponse response, Object object) throws Exception { 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.analytics.account", analyticsAccount);
request.setAttribute("google.ads.enabled", adsEnabled); request.setAttribute("google.ads.enabled", adsEnabled);
request.setAttribute("site.homepage", siteHomepage); 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 the property could not be resolved, try to infer one from the request...
if ("${site.baseurl}".equals(siteUrl)) { if ("${site.baseurl}".equals(siteUrl)) {

2
wise-webapp/src/main/webapp/jsp/accountSettings.jsp
View File

@ -3,8 +3,10 @@
<div> <div>
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
<c:if test="${requestScope['security.type']=='db'}">
<li class="active"><a href="#changeUserPanel" data-toggle="pill"><spring:message code="GENERAL"/></a></li> <li class="active"><a href="#changeUserPanel" data-toggle="pill"><spring:message code="GENERAL"/></a></li>
<li><a href="#changePasswordPanel" data-toggle="pill"><spring:message code="SECURITY"/></a></li> <li><a href="#changePasswordPanel" data-toggle="pill"><spring:message code="SECURITY"/></a></li>
</c:if>
<li><a href="#languagePanel" data-toggle="pill"><spring:message code="LANGUAGE"/></a></li> <li><a href="#languagePanel" data-toggle="pill"><spring:message code="LANGUAGE"/></a></li>
</ul> </ul>

3
wise-webapp/src/main/webapp/jsp/login.jsp
View File

@ -69,14 +69,17 @@
<div class="row"> <div class="row">
<div id="register" class="span12"> <div id="register" class="span12">
<c:if test="${requestScope['security.type']=='db'}">
<b><spring:message code="NOT_READY_A_USER"/></b> <b><spring:message code="NOT_READY_A_USER"/></b>
<spring:message code="NOT_READY_A_USER_MESSAGE"/> <spring:message code="NOT_READY_A_USER_MESSAGE"/>
<a href="c/user/registration"> <a href="c/user/registration">
<spring:message code="JOIN_NOW"/> <spring:message code="JOIN_NOW"/>
</a> </a>
</c:if>
</div> </div>
</div> </div>
<c:if test="${isHsql== 'true'}"> <c:if test="${isHsql== 'true'}">
<div class="row-fluid"> <div class="row-fluid">
<div class="alert alert-info span offset12"> <div class="alert alert-info span offset12">