Merge branch 'Verze_1.0'

src/main/java/info/bukova/isspst/services/users/UserService.java

@@ -27,5 +27,6 @@ public interface UserService extends UserDetailsService, Service<User> {
 	public void setUserSettings(UserSettingsData settings);
 	public void setAuthMethod(AuthMethod method);
 	public AuthMethod getAuthMethod();
+	public List<User> getUsersForCombo();
 	
 }

src/main/java/info/bukova/isspst/services/users/UserServiceImpl.java

@@ -230,4 +230,12 @@ public class UserServiceImpl extends AbstractService<User> implements UserServic
 		}
 	}
 
+	@SuppressWarnings("unchecked")
+	@Override
+	@Transactional
+	public List<User> getUsersForCombo() {
+		Query q = dao.getQuery("from User u order by u.lastName");
+		return q.list();
+	}
+
 }

src/main/java/info/bukova/isspst/ui/requirement/RequirementSubpage.java

@@ -25,7 +25,7 @@ public class RequirementSubpage<T extends RequirementBase> extends ListViewModel
 
 	public List<User> getAllUsers()
 	{
-		return userService.getAll();
+		return userService.getUsersForCombo();
 	}
 
 	private BigDecimalConverter bigDecimalConverter;

src/main/java/info/bukova/isspst/ui/requirement/TripRequirementForm.java

@@ -42,7 +42,7 @@ public class TripRequirementForm extends FormViewModel<TripRequirement> {
 	public void init() {
 		tripRequirementService.loadType(getDataBean());
 		centres = reqTypeService.filterCentres(getDataBean().getType(), workgroupService.getUserCentres(userService.getCurrent()));
-		users = userService.getAll();
+		users = userService.getUsersForCombo();
 		passengers = getDataBean().getPassengers();
 		validator = new TripRequirementFormValidator();
 	}