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

Bug #1547: Allow user with role SUPERUSER to create new projects

Browse source 
FEA: ItEr77S04BugFixing
This commit is contained in:
Manuel Rego Casasnovas 2012-10-19 11:34:37 +02:00
parent f0ebe2f896
commit 07ca5fd443
4 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java
View file

@ -1439,7 +1439,8 @@ public class OrderCRUDController extends GenericForwardComposer {
* the create buttons accordingly.
*/
private void checkCreationPermissions() {
if (!SecurityUtils.isUserInRole(UserRole.ROLE_CREATE_PROJECTS)) {
if (!SecurityUtils
.isSuperuserOrUserInRoles(UserRole.ROLE_CREATE_PROJECTS)) {
if (createOrderButton != null) {
createOrderButton.setDisabled(true);
}

6
libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java
View file

@ -771,7 +771,8 @@ public class OrderModel extends IntegrationEntityModel implements IOrderModel {
return true;
}
if (order.isNewObject()
& SecurityUtils.isUserInRole(UserRole.ROLE_CREATE_PROJECTS)) {
& SecurityUtils
.isSuperuserOrUserInRoles(UserRole.ROLE_CREATE_PROJECTS)) {
return true;
}
try {
@ -801,7 +802,8 @@ public class OrderModel extends IntegrationEntityModel implements IOrderModel {
return true;
}
if (order.isNewObject()
& SecurityUtils.isUserInRole(UserRole.ROLE_CREATE_PROJECTS)) {
& SecurityUtils
.isSuperuserOrUserInRoles(UserRole.ROLE_CREATE_PROJECTS)) {
return true;
}
try {

4
libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java
View file

@ -45,7 +45,6 @@ import org.zkoss.ganttz.IPredicate;
import org.zkoss.ganttz.Planner;
import org.zkoss.ganttz.extensions.ICommandOnTask;
import org.zkoss.ganttz.timetracker.zoom.ZoomLevel;
import org.zkoss.web.servlet.dsp.action.Page;
import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.Executions;
import org.zkoss.zk.ui.WrongValueException;
@ -149,7 +148,8 @@ public class CompanyPlanningController implements Composer {
* the create buttons accordingly.
*/
private void checkCreationPermissions() {
if (!SecurityUtils.isUserInRole(UserRole.ROLE_CREATE_PROJECTS)) {
if (!SecurityUtils
.isSuperuserOrUserInRoles(UserRole.ROLE_CREATE_PROJECTS)) {
Button createOrderButton = (Button) planner.getPage().getFellow(
"createOrderButton");
if (createOrderButton != null) {

3
libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java
View file

@ -407,7 +407,8 @@ public class MultipleTabsPlannerController implements Composer,
}
handler.registerBookmarkListener(this, comp.getPage());
if (SecurityUtils.isUserInRole(UserRole.ROLE_CREATE_PROJECTS)) {
if (SecurityUtils
.isSuperuserOrUserInRoles(UserRole.ROLE_CREATE_PROJECTS)) {
org.zkoss.zk.ui.Component createOrderButton = comp.getPage()
.getFellowIfAny(
"createOrderButton");