diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsModel.java index 8f1ec9bd2..61ae7f496 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsModel.java @@ -19,9 +19,11 @@ package org.libreplan.web.users.settings; +import java.util.Collections; import java.util.List; import org.apache.commons.lang.Validate; +import org.hibernate.annotations.Sort; import org.libreplan.business.calendars.daos.IBaseCalendarDAO; import org.libreplan.business.calendars.entities.BaseCalendar; import org.libreplan.business.common.exceptions.InstanceNotFoundException; @@ -103,6 +105,7 @@ public class SettingsModel implements ISettingsModel { for (Label label : allLabels) { label.getType().getName(); } + Collections.sort(allLabels); } @Transactional(readOnly = true) @@ -112,6 +115,7 @@ public class SettingsModel implements ISettingsModel { for (Criterion criterion : allCriteria) { criterion.getType().getName(); } + Collections.sort(allCriteria); } @Transactional(readOnly = true) diff --git a/libreplan-webapp/src/main/webapp/myaccount/settings.zul b/libreplan-webapp/src/main/webapp/myaccount/settings.zul index 4f9e8a53f..22d8d88f9 100644 --- a/libreplan-webapp/src/main/webapp/myaccount/settings.zul +++ b/libreplan-webapp/src/main/webapp/myaccount/settings.zul @@ -127,11 +127,12 @@ id="projectsFilterLabelBandboxSearch" finder="LabelBandboxFinder" model="@{settingsController.allLabels}" - selectedElement="@{settingsController.projectsFilterLabel}" /> + selectedElement="@{settingsController.projectsFilterLabel}" + widthListbox="450px" widthBandbox="200px"/>