diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/IUserModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/IUserModel.java index 520bbb638..bf6391fce 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/IUserModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/IUserModel.java @@ -96,4 +96,12 @@ public interface IUserModel { */ List getProfiles(); + /** + * Removes a profile from the list of {@link Profile} objects associated + * with the current User. + * + * @param role The {@link Profile} object to be removed. + */ + void removeProfile(Profile profile); + } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java index 819bcc2c2..10a642cf0 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserCRUDController.java @@ -168,6 +168,11 @@ public class UserCRUDController extends GenericForwardComposer implements return userModel.getProfiles(); } + public void removeProfile(Profile profile) { + userModel.removeProfile(profile); + Util.reloadBindings(createWindow); + } + private OnlyOneVisible getVisibility() { return (visibility == null) ? new OnlyOneVisible(createWindow, listWindow) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserModel.java index f7946a5f0..dbf713bb7 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/UserModel.java @@ -137,4 +137,9 @@ public class UserModel implements IUserModel { } return list; } + + @Override + public void removeProfile(Profile profile) { + user.removeProfile(profile); + } } diff --git a/navalplanner-webapp/src/main/webapp/users/_editUser.zul b/navalplanner-webapp/src/main/webapp/users/_editUser.zul index 8c8a3492e..c253514a9 100644 --- a/navalplanner-webapp/src/main/webapp/users/_editUser.zul +++ b/navalplanner-webapp/src/main/webapp/users/_editUser.zul @@ -81,10 +81,18 @@ +