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

the parent from which a new work week derives, must be specified.

Browse source 
FEA: ItEr75S05CalendarAdminInterfaceItEr74S06
This commit is contained in:
Susana Montes Pedreira 2011-06-21 09:52:31 +02:00
parent bf4ac9a147
commit 7a1a2e59d4
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java
View file

@ -949,6 +949,9 @@ public abstract class BaseCalendarEditionController extends
if (isDerived()) {
Combobox parentCalendars = (Combobox) createNewVersionWindow
.getFellow("parentCalendars");
if (parentCalendars.getSelectedItem() == null) {
return;
}
selected = (BaseCalendar) parentCalendars.getSelectedItem()
.getValue();
}

1
navalplanner-webapp/src/main/webapp/calendars/_createNewVersion.zul
View file

@ -28,6 +28,7 @@
<label value="${i18n:_('Type')}:"/>
<label value="@{calendarController.editionController.calendarType}"/>
<combobox id="parentCalendars"
constraint="no empty:${i18n:_('cannot be null or empty')}"
model="@{calendarController.editionController.parentCalendars}">
<comboitem self="@{each='baseCalnedar'}"
value="@{baseCalnedar}" label="@{baseCalnedar.name}" />