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

tim-connector: Rename page to "Job Scheduling" and associated files

Browse source 
* Renamed .zul file and page to "Job Scheduling".
* Include ROLE_JOB_SCHEDULING in default profile SYSTEMS_ADMINISTRATOR.

FEA: ItEr77S16JiraAndTimConnectorContributionIntegration
This commit is contained in:
Manuel Rego Casasnovas 2013-02-13 13:59:11 +01:00
parent 04f3138b82
commit 6898dbdbf1
5 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libreplan-business/src/main/java/org/libreplan/business/users/bootstrap/PredefinedProfiles.java
View file

@ -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,

2
libreplan-business/src/main/java/org/libreplan/business/users/entities/UserRole.java
View file

@ -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")),

4
libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java
View file

@ -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"));
}

2
libreplan-webapp/src/main/java/org/libreplan/web/common/JobSchedulerModel.java
View file

@ -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

2
libreplan-webapp/src/main/webapp/common/job_scheduler_configuration.zul → libreplan-webapp/src/main/webapp/common/job_scheduling.zul
View file

@ -17,7 +17,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<?page id="exceptionDayTypesList" title="${i18n:_('LibrePlan: Job scheduler')}" ?>
<?page id="exceptionDayTypesList" title="${i18n:_('LibrePlan: Job Scheduling')}" ?>
<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>