From 5b25d96c855bcf0fbd001b803a166319bdccd856 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Thu, 17 Jan 2019 14:26:31 +0100
Subject: [PATCH] Alphabetic sorting of users
---
.../logic/controller/servlet/PointOfInterestController.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/main/java/no/nibio/vips/logic/controller/servlet/PointOfInterestController.java b/src/main/java/no/nibio/vips/logic/controller/servlet/PointOfInterestController.java
index 1d618d96..92fbdfd4 100755
--- a/src/main/java/no/nibio/vips/logic/controller/servlet/PointOfInterestController.java
+++ b/src/main/java/no/nibio/vips/logic/controller/servlet/PointOfInterestController.java
@@ -24,6 +24,7 @@ import com.vividsolutions.jts.geom.GeometryFactory;
import com.vividsolutions.jts.geom.Point;
import java.io.IOException;
import java.net.URISyntaxException;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -239,7 +240,9 @@ public class PointOfInterestController extends HttpServlet {
request.setAttribute("messageKey", request.getParameter("messageKey"));
if(user.isSuperUser())
{
- request.getSession().setAttribute("users", em.createNamedQuery("VipsLogicUser.findAll", VipsLogicUser.class).getResultList());
+ List<VipsLogicUser> users = em.createNamedQuery("VipsLogicUser.findAll", VipsLogicUser.class).getResultList();
+ Collections.sort(users);
+ request.getSession().setAttribute("users", users);
}
request.setAttribute("returnURL","weatherStation?organizationId=" + weatherStation.getUserId().getOrganizationId().getOrganizationId());
request.getRequestDispatcher("/weatherstationForm.ftl").forward(request, response);
--
GitLab