From eb486c14c29b4d5c8a71d3c134f3782ca6ef3fad Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Wed, 28 Dec 2011 12:30:41 +0100 Subject: [PATCH] Hide warning messages on bottom when user is not admin FEA: ItEr75S04BugFixing --- .../main/java/org/libreplan/web/common/ITemplateModel.java | 2 ++ .../java/org/libreplan/web/common/TemplateController.java | 5 +++++ .../main/java/org/libreplan/web/common/TemplateModel.java | 7 +++++++ .../src/main/webapp/common/layout/template.zul | 2 +- 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/ITemplateModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/ITemplateModel.java index ca974705f..8736564a4 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/ITemplateModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/ITemplateModel.java @@ -56,4 +56,6 @@ public interface ITemplateModel { String getIdUser(String login); + boolean isUserAdmin(); + } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateController.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateController.java index 6c19ca157..66cb1c88e 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateController.java @@ -177,4 +177,9 @@ public class TemplateController extends GenericForwardComposer { public String getIdWswriterUser() { return templateModel.getIdUser(MandatoryUser.WSWRITER.getLoginName()); } + + public boolean isUserAdmin() { + return templateModel.isUserAdmin(); + } + } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java index 62e651454..ad2eedd33 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateModel.java @@ -51,6 +51,7 @@ import org.libreplan.business.scenarios.entities.OrderVersion; import org.libreplan.business.scenarios.entities.Scenario; import org.libreplan.business.users.daos.IUserDAO; import org.libreplan.business.users.entities.User; +import org.libreplan.web.UserUtil; import org.libreplan.web.security.SecurityUtils; import org.libreplan.web.users.bootstrap.MandatoryUser; import org.libreplan.web.users.services.CustomUser; @@ -477,4 +478,10 @@ public class TemplateModel implements ITemplateModel { return null; } } + + @Override + @Transactional(readOnly = true) + public boolean isUserAdmin() { + return UserUtil.getUserFromSession().isAdministrator(); + } } diff --git a/libreplan-webapp/src/main/webapp/common/layout/template.zul b/libreplan-webapp/src/main/webapp/common/layout/template.zul index 4ac6728b2..5025e945d 100644 --- a/libreplan-webapp/src/main/webapp/common/layout/template.zul +++ b/libreplan-webapp/src/main/webapp/common/layout/template.zul @@ -126,7 +126,7 @@ signature="java.lang.Boolean isDefaultPasswordsControl()"?> - +