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

ItEr36S07ValidacionEProbasFuncionaisItEr35S08: Changed the way to create calendars when saving a resource.

Browse source
This commit is contained in:
Manuel Rego Casasnovas 2009-11-25 18:02:40 +01:00 • committed by Javier Moran Rua
parent 53278272bd
commit ae33db67ac
3 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java
View file

@ -362,8 +362,8 @@ public class BaseCalendar extends BaseEntity implements IWorkHours {
return derivedCalendar;
}
public BaseCalendar newDerivedResourceCalendar() {
BaseCalendar derivedCalendar = ResourceCalendar.create();
public ResourceCalendar newDerivedResourceCalendar() {
ResourceCalendar derivedCalendar = ResourceCalendar.create();
derivedCalendar.setParent(this);
return derivedCalendar;
}

4
navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java
View file

@ -254,10 +254,8 @@ public class MachineCRUDController extends GenericForwardComposer {
if (parentCalendar == null) {
parentCalendar = machineModel.getDefaultCalendar();
}
resourceCalendarModel.initCreateDerived(parentCalendar);
machineModel.setCalendar((ResourceCalendar) resourceCalendarModel
.getBaseCalendar());
machineModel.setCalendar(parentCalendar.newDerivedResourceCalendar());
}
private Window editCalendarWindow;

4
navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java
View file

@ -340,10 +340,8 @@ public class WorkerCRUDController extends GenericForwardComposer implements
if (parentCalendar == null) {
parentCalendar = workerModel.getDefaultCalendar();
}
resourceCalendarModel.initCreateDerived(parentCalendar);
workerModel.setCalendar((ResourceCalendar) resourceCalendarModel
.getBaseCalendar());
workerModel.setCalendar(parentCalendar.newDerivedResourceCalendar());
}
public void editCalendar() {