Skip to content
Snippets Groups Projects
Commit 5b25d96c authored by Tor-Einar Skog's avatar Tor-Einar Skog
Browse files

Alphabetic sorting of users

parent 3280116b
Branches
Tags
2 merge requests!17Develop,!9Update with develop before real branch work starts
...@@ -24,6 +24,7 @@ import com.vividsolutions.jts.geom.GeometryFactory; ...@@ -24,6 +24,7 @@ import com.vividsolutions.jts.geom.GeometryFactory;
import com.vividsolutions.jts.geom.Point; import com.vividsolutions.jts.geom.Point;
import java.io.IOException; import java.io.IOException;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
...@@ -239,7 +240,9 @@ public class PointOfInterestController extends HttpServlet { ...@@ -239,7 +240,9 @@ public class PointOfInterestController extends HttpServlet {
request.setAttribute("messageKey", request.getParameter("messageKey")); request.setAttribute("messageKey", request.getParameter("messageKey"));
if(user.isSuperUser()) 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.setAttribute("returnURL","weatherStation?organizationId=" + weatherStation.getUserId().getOrganizationId().getOrganizationId());
request.getRequestDispatcher("/weatherstationForm.ftl").forward(request, response); request.getRequestDispatcher("/weatherstationForm.ftl").forward(request, response);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment