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

ItEr23S08CUEdicionCalendarioLaboral: Fixing bug when creating a derived calendar.

Browse source
This commit is contained in:
Manuel Rego Casasnovas 2009-08-26 19:16:58 +02:00 • committed by Óscar González Fernández
parent 9827bebf7f
commit 69be3389a8
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java
View file

@ -30,6 +30,7 @@ import org.zkoss.zk.ui.util.GenericForwardComposer;
import org.zkoss.zul.Button;
import org.zkoss.zul.Checkbox;
import org.zkoss.zul.Combobox;
import org.zkoss.zul.Comboitem;
import org.zkoss.zul.Intbox;
import org.zkoss.zul.Label;
import org.zkoss.zul.Listcell;
@ -417,19 +418,20 @@ public class BaseCalendarCRUDController extends GenericForwardComposer {
.getFellow("parentCalendars");
}
markSelectedParentCombo(parentCalendars);
fillParentCombo(parentCalendars);
addListenerParentCombo(parentCalendars);
}
private void markSelectedParentCombo(final Combobox parentCalendars) {
private void fillParentCombo(Combobox parentCalendars) {
BaseCalendar parent = baseCalendarModel.getParent();
List<BaseCalendar> possibleParentCalendars = getParentCalendars();
for (BaseCalendar baseCalendar : possibleParentCalendars) {
Comboitem item = new Comboitem(baseCalendar.getName());
item.setValue(baseCalendar);
parentCalendars.appendChild(item);
if (baseCalendar.getId().equals(parent.getId())) {
parentCalendars.setSelectedIndex(possibleParentCalendars
.indexOf(baseCalendar));
break;
parentCalendars.setSelectedItem(item);
}
}
}

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

@ -29,7 +29,6 @@
<label value="@{controller.calendarType}" />
<combobox id="parentCalendars"
visible="@{controller.isDerived}"
model="@{controller.parentCalendars}"
disabled="@{controller.isViewingHistory}">
<comboitem self="@{each='baseCalnedar'}" value="@{baseCalnedar}"
label="@{baseCalnedar.name}" />