From 7ac04693c52980ec758858841ea01d1cdbcfb3cf Mon Sep 17 00:00:00 2001
From: Ignacio Diaz Teijido <ignacio.diaz@cafedered.com>
Date: Fri, 17 Feb 2012 16:03:37 +0100
Subject: [PATCH] Added condition to method isLdapUser to check configuration

FEA: ItEr76S12LdapAuthentication
---
 .../libreplan/web/users/settings/IPasswordModel.java |  2 ++
 .../web/users/settings/PasswordController.java       |  5 +++--
 .../libreplan/web/users/settings/PasswordModel.java  | 12 ++++++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/IPasswordModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/IPasswordModel.java
index e31e24242..96395afcf 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/IPasswordModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/IPasswordModel.java
@@ -42,4 +42,6 @@ public interface IPasswordModel {
 
     boolean validateCurrentPassword(String value);
 
+    boolean isLdapAuthEnabled();
+
 }
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java b/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java
index 10f505ff5..6a7465645 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java
@@ -82,8 +82,9 @@ public class PasswordController extends GenericForwardComposer {
         passwordModel.setPassword(password);
     }
 
-    public boolean getLdapUser() {
-        return !UserUtil.getUserFromSession().isLibrePlanUser();
+    public boolean isLdapUser() {
+        return (!UserUtil.getUserFromSession().isLibrePlanUser() && passwordModel
+                .isLdapAuthEnabled());
     }
 
     public Constraint validatePasswordConfirmation() {
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordModel.java
index 84be55adb..7252f1a22 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordModel.java
@@ -20,6 +20,7 @@
 package org.libreplan.web.users.settings;
 
 import org.libreplan.business.common.Configuration;
+import org.libreplan.business.common.daos.IConfigurationDAO;
 import org.libreplan.business.common.exceptions.InstanceNotFoundException;
 import org.libreplan.business.common.exceptions.ValidationException;
 import org.libreplan.business.users.daos.IUserDAO;
@@ -50,6 +51,9 @@ public class PasswordModel implements IPasswordModel {
     @Autowired
     private IUserDAO userDAO;
 
+    @Autowired
+    private IConfigurationDAO configurationDAO;
+
     private User user;
 
     @Autowired
@@ -143,4 +147,12 @@ public class PasswordModel implements IPasswordModel {
         }
         return true;
     }
+
+    @Transactional(readOnly = true)
+    @Override
+    public boolean isLdapAuthEnabled() {
+        return configurationDAO.getConfiguration().getLdapConfiguration()
+                .getLdapAuthEnabled();
+    }
+
 }