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

Prevent users to create labels from project edition if they do not have ROLE_LABELS

Browse source 
FEA: ItEr76S30PermissionsEnhancements
This commit is contained in:
Manuel Rego Casasnovas 2012-06-19 13:27:34 +02:00
parent 4dee1ced71
commit 00ea98e5d4
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libreplan-webapp/src/main/java/org/libreplan/web/orders/labels/AssignedLabelsController.java
View file

@ -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<T, M> extends
private BandboxSearch bdLabels;
private Button buttonCreateAndAssign;
public void openWindow(M model) {
setOuterModel(model);
openElement(getElement());
@ -101,6 +106,12 @@ public abstract class AssignedLabelsController<T, M> 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) {

2
libreplan-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul
View file

@ -92,7 +92,7 @@
<autocomplete id="cbLabelType" onChange="txtLabelName.clearErrorMessage()"
finder="LabelTypeFinder" buttonVisible="true" />
<textbox id="txtLabelName" />
<button style="margin-top: -4px"
<button id="buttonCreateAndAssign" style="margin-top: -4px"
label="${i18n:_('Create &amp; Assign')}"
onClick="assignedLabelsController.onCreateAndAssign()" />
</hbox>