From 07ca5fd443d802d23d1553f0f4baaf7b3865e046 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Fri, 19 Oct 2012 11:34:37 +0200
Subject: [PATCH] Bug #1547: Allow user with role SUPERUSER to create new
 projects

FEA: ItEr77S04BugFixing
---
 .../java/org/libreplan/web/orders/OrderCRUDController.java  | 3 ++-
 .../src/main/java/org/libreplan/web/orders/OrderModel.java  | 6 ++++--
 .../web/planner/company/CompanyPlanningController.java      | 4 ++--
 .../web/planner/tabs/MultipleTabsPlannerController.java     | 3 ++-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java
index f3febbf86..fbfa57a13 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java
@@ -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);
             }
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java
index 4cb08475d..d32f21864 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java
@@ -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 {
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java
index 7bc641c09..d1b6a24fd 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java
@@ -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) {
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java
index 434701c19..8c2b88858 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java
@@ -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");