From ad379e4ec7bae58e3d2f0eb617120845b86ada48 Mon Sep 17 00:00:00 2001 From: Ignacio Diaz Teijido Date: Fri, 17 Feb 2012 16:03:36 +0100 Subject: [PATCH] Disallow to change roles and profiles in admin panel for LDAP users when roles are imported from LDAP FEA: ItEr76S12LdapAuhentication --- .../main/java/org/libreplan/web/users/IUserModel.java | 2 ++ .../org/libreplan/web/users/UserCRUDController.java | 4 ++++ .../main/java/org/libreplan/web/users/UserModel.java | 7 +++++++ libreplan-webapp/src/main/webapp/users/_editUser.zul | 10 ++++++++-- 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/users/IUserModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/users/IUserModel.java index bc8c49364..fd13e681c 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/users/IUserModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/users/IUserModel.java @@ -127,4 +127,6 @@ public interface IUserModel { boolean isLDAPBeingUsed(); + boolean isLDAPRolesBeingUsed(); + } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java index 600b6365d..140ab479c 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java @@ -228,4 +228,8 @@ public class UserCRUDController extends BaseCRUDController implements return (isLdapUser() && userModel.isLDAPBeingUsed()); } + public boolean getLdapUserRolesLdapConfiguration() { + return (isLdapUser() && userModel.isLDAPRolesBeingUsed()); + } + } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/users/UserModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/users/UserModel.java index a89cd4837..ca255e06c 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/users/UserModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/users/UserModel.java @@ -248,4 +248,11 @@ public class UserModel implements IUserModel { .getLdapAuthEnabled(); } + @Transactional(readOnly = true) + @Override + public boolean isLDAPRolesBeingUsed() { + return configurationDAO.getConfiguration().getLdapConfiguration() + .getLdapSaveRolesDB(); + } + } diff --git a/libreplan-webapp/src/main/webapp/users/_editUser.zul b/libreplan-webapp/src/main/webapp/users/_editUser.zul index 979cacbb4..af0003561 100644 --- a/libreplan-webapp/src/main/webapp/users/_editUser.zul +++ b/libreplan-webapp/src/main/webapp/users/_editUser.zul @@ -93,10 +93,13 @@ + +