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

Fixed bug disabling create buttons if user does not have the proper permissions.

Browse source 
FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
This commit is contained in:
Manuel Rego Casasnovas 2010-09-20 20:29:26 +02:00
parent e73c768b9f
commit f2e07cb07e
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
View file

@ -243,6 +243,8 @@ public class OrderCRUDController extends GenericForwardComposer {
.getFellow("bdFilters");
checkIncludeOrderElements = (Checkbox) filterComponent
.getFellow("checkIncludeOrderElements");
checkCreationPermissions();
}
private void initEditOrderElementWindow() {
@ -895,7 +897,6 @@ public class OrderCRUDController extends GenericForwardComposer {
orderModel.prepareForCreate();
prepareEditWindow();
showEditWindow(_("Create order"));
checkCreationPermissions();
} catch (ConcurrentModificationException e) {
messagesForUser.showMessage(Level.ERROR, e.getMessage());
}
@ -1223,14 +1224,12 @@ public class OrderCRUDController extends GenericForwardComposer {
/**
* Checks the creation permissions of the current user and enables/disables
* the save buttons accordingly.
* the create buttons accordingly.
*/
private void checkCreationPermissions() {
if(SecurityUtils.isUserInRole(UserRole.ROLE_CREATE_ORDER)) {
saveOrderAndContinueButton.setDisabled(false);
}
else {
saveOrderAndContinueButton.setDisabled(true);
if (!SecurityUtils.isUserInRole(UserRole.ROLE_CREATE_ORDER)) {
createOrderButton.setDisabled(true);
createOrderFromTemplateButton.setDisabled(true);
}
}