diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java index d4c4e61ac..98fa6fd61 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java @@ -26,12 +26,15 @@ import java.util.List; import org.libreplan.business.labels.entities.Label; import org.libreplan.business.labels.entities.LabelType; +import org.libreplan.business.users.entities.UserRole; import org.libreplan.web.common.Util; import org.libreplan.web.common.components.Autocomplete; import org.libreplan.web.common.components.bandboxsearch.BandboxSearch; import org.libreplan.web.orders.IOrderElementModel; +import org.libreplan.web.security.SecurityUtils; import org.zkoss.zk.ui.WrongValueException; import org.zkoss.zk.ui.util.GenericForwardComposer; +import org.zkoss.zul.Button; import org.zkoss.zul.Comboitem; import org.zkoss.zul.Grid; import org.zkoss.zul.Textbox; @@ -51,6 +54,8 @@ public abstract class AssignedLabelsController extends private BandboxSearch bdLabels; + private Button buttonCreateAndAssign; + public void openWindow(M model) { setOuterModel(model); openElement(getElement()); @@ -101,6 +106,12 @@ public abstract class AssignedLabelsController extends * labels */ public void onCreateAndAssign() { + // Check if user has permissions to create labels + if (!SecurityUtils.isSuperuserOrUserInRoles(UserRole.ROLE_LABELS)) { + throw new WrongValueException(buttonCreateAndAssign, + _("you do not have permissions to create new labels")); + } + // Check LabelType is not null final Comboitem comboitem = cbLabelType.getSelectedItem(); if (comboitem == null || comboitem.getValue() == null) { diff --git a/libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul b/libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul index 61ef2ed4e..97f355667 100644 --- a/libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul +++ b/libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul @@ -92,7 +92,7 @@ -