RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added condition to method isLdapUser to check configuration

Browse source 
FEA: ItEr76S12LdapAuthentication
This commit is contained in:
Ignacio Diaz Teijido 2012-02-17 16:03:37 +01:00 • committed by Manuel Rego Casasnovas
parent ad379e4ec7
commit 46e0065151
3 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libreplan-webapp/src/main/java/org/libreplan/web/users/settings/IPasswordModel.java
View file

@ -42,4 +42,6 @@ public interface IPasswordModel {
boolean validateCurrentPassword(String value);
boolean isLdapAuthEnabled();
}

5
libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordController.java
View file

@ -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() {

12
libreplan-webapp/src/main/java/org/libreplan/web/users/settings/PasswordModel.java
View file

@ -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();
}
}