From a9d974e0cede3ee108f4f2ecd8e5196dcb6cd330 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lorenzo=20Tilve=20=C3=81lvaro?= <ltilve@igalia.com>
Date: Tue, 26 Mar 2013 17:46:03 +0100
Subject: [PATCH] Configures a new userRole to restrict access to import
 project functionality

FEA: ItEr77S05BasicProjectImport
---
 .../org/libreplan/business/users/entities/UserRole.java   | 1 +
 .../org/libreplan/web/common/CustomMenuController.java    | 8 +++++---
 .../resources/libreplan-webapp-spring-security-config.xml | 3 +++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java b/libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java
index 6f3d2c394..e3984f363 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java
@@ -46,6 +46,7 @@ public enum UserRole {
     // Page roles
     ROLE_PLANNING(_("Planning")),
     ROLE_TEMPLATES(_("Templates")),
+    ROLE_IMPORT_PROJECTS(_("Import projects")),
     ROLE_WORKERS(_("Workers")),
     ROLE_MACHINES(_("Machines")),
     ROLE_VIRTUAL_WORKERS(_("Virtual Workers")),
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java
index 626ebb88a..403111f57 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java
@@ -273,9 +273,6 @@ public class CustomMenuController extends Div implements IMenuItemsRegister {
                     globalView.goToOrdersList();
                 }
             }, "01-introducion.html#id2"));
-            // In order of see the Import project option in the menu
-            planningItems.add(subItem(_("Import project"),
-                    "/orders/imports/projectImport.zul", ""));
         }
         if (SecurityUtils.isSuperuserOrUserInRoles(UserRole.ROLE_PLANNING)) {
             planningItems.add(subItem(_("Resources Load"), new ICapture() {
@@ -295,6 +292,11 @@ public class CustomMenuController extends Div implements IMenuItemsRegister {
             planningItems.add(subItem(_("Templates"),
                     "/templates/templates.zul", ""));
         }
+        if (SecurityUtils.isSuperuserOrUserInRoles(UserRole.ROLE_IMPORT_PROJECTS)) {
+        // In order of see the Import project option in the menu
+        planningItems.add(subItem(_("Import project"),
+                "/orders/imports/projectImport.zul", ""));
+        }
         if (!planningItems.isEmpty()) {
             topItem(_("Planning"), "/planner/index.zul", "", planningItems);
         }
diff --git a/libreplan-webapp/src/main/resources/libreplan-webapp-spring-security-config.xml b/libreplan-webapp/src/main/resources/libreplan-webapp-spring-security-config.xml
index 0349da62f..5073e5911 100644
--- a/libreplan-webapp/src/main/resources/libreplan-webapp-spring-security-config.xml
+++ b/libreplan-webapp/src/main/resources/libreplan-webapp-spring-security-config.xml
@@ -117,6 +117,9 @@
             access="ROLE_BOUND_USER" />
         <intercept-url pattern="/myaccount/monthlyTimesheet.zul"
             access="ROLE_SUPERUSER,ROLE_TIMESHEETS,ROLE_BOUND_USER" />
+        <intercept-url pattern="/orders/imports/projectImport.zul"
+            access="ROLE_SUPERUSER,ROLE_IMPORT_PROJECTS" />
+
 
         <intercept-url pattern="/**" access="IS_AUTHENTICATED_FULLY" />