diff --git a/libreplan-business/src/main/java/org/libreplan/business/users/bootstrap/PredefinedProfiles.java b/libreplan-business/src/main/java/org/libreplan/business/users/bootstrap/PredefinedProfiles.java index 897e321e0..b7c0f7fee 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/users/bootstrap/PredefinedProfiles.java +++ b/libreplan-business/src/main/java/org/libreplan/business/users/bootstrap/PredefinedProfiles.java @@ -29,6 +29,7 @@ import static org.libreplan.business.users.entities.UserRole.ROLE_ESTIMATED_PLAN import static org.libreplan.business.users.entities.UserRole.ROLE_EXPENSES; import static org.libreplan.business.users.entities.UserRole.ROLE_HOURS_TYPES; import static org.libreplan.business.users.entities.UserRole.ROLE_HOURS_WORKED_PER_RESOURCE_REPORT; +import static org.libreplan.business.users.entities.UserRole.ROLE_JOB_SCHEDULING; import static org.libreplan.business.users.entities.UserRole.ROLE_LABELS; import static org.libreplan.business.users.entities.UserRole.ROLE_MACHINES; import static org.libreplan.business.users.entities.UserRole.ROLE_MAIN_SETTINGS; @@ -74,7 +75,7 @@ import org.libreplan.business.users.entities.UserRole; public enum PredefinedProfiles { SYSTEMS_ADMINISTRATOR("Systems Administrator", ROLE_MAIN_SETTINGS, - ROLE_USER_ACCOUNTS, ROLE_PROFILES), + ROLE_USER_ACCOUNTS, ROLE_PROFILES, ROLE_JOB_SCHEDULING), PROJECT_MANAGER("Project Manager", ROLE_READ_ALL_PROJECTS, ROLE_EDIT_ALL_PROJECTS, ROLE_CREATE_PROJECTS, ROLE_PLANNING, 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 3c73793d0..3f37aa9c0 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 @@ -65,7 +65,7 @@ public enum UserRole { ROLE_MAIN_SETTINGS(_("Main Settings")), ROLE_USER_ACCOUNTS(_("User Accounts")), ROLE_PROFILES(_("Profiles")), - ROLE_JOB_SCHEDULING(_("Job Scheduler")), + ROLE_JOB_SCHEDULING(_("Job Scheduling")), ROLE_COMPANIES(_("Companies")), ROLE_SEND_TO_SUBCONTRACTORS(_("Send To Subcontractors")), ROLE_RECEIVED_FROM_SUBCONTRACTORS(_("Received From Subcontractors")), 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 9318d1424..be1c5fde4 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 @@ -411,8 +411,8 @@ public class CustomMenuController extends Div implements IMenuItemsRegister { } if (SecurityUtils .isSuperuserOrUserInRoles(UserRole.ROLE_JOB_SCHEDULING)) { - configurationItems.add(subItem(_("Job Scheduler"), - "/common/job_scheduler_configuration.zul", + configurationItems.add(subItem(_("Job Scheduling"), + "/common/job_scheduling.zul", "16-ldap-authentication.html")); } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/JobSchedulerModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/JobSchedulerModel.java index 42fa8544f..0a78e62f8 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/JobSchedulerModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/JobSchedulerModel.java @@ -41,7 +41,7 @@ import org.springframework.transaction.annotation.Transactional; */ @Service @Scope(BeanDefinition.SCOPE_PROTOTYPE) -@OnConcurrentModification(goToPage = "/common/job_scheduler_configuration.zul") +@OnConcurrentModification(goToPage = "/common/job_scheduling.zul") public class JobSchedulerModel implements IJobSchedulerModel { @Autowired diff --git a/libreplan-webapp/src/main/webapp/common/job_scheduler_configuration.zul b/libreplan-webapp/src/main/webapp/common/job_scheduling.zul similarity index 99% rename from libreplan-webapp/src/main/webapp/common/job_scheduler_configuration.zul rename to libreplan-webapp/src/main/webapp/common/job_scheduling.zul index b3ef91bf2..ecacf2fb8 100644 --- a/libreplan-webapp/src/main/webapp/common/job_scheduler_configuration.zul +++ b/libreplan-webapp/src/main/webapp/common/job_scheduling.zul @@ -17,7 +17,7 @@ along with this program. If not, see . --> - +