Mercurial > lada > lada-server
diff src/main/java/de/intevation/lada/util/auth/HeaderAuthorization.java @ 840:2fe625c91ab3
Merged branches.
author | Raimund Renkert <raimund.renkert@intevation.de> |
---|---|
date | Thu, 21 Jan 2016 09:01:57 +0100 |
parents | fa922101a462 1ed347eb856b |
children | c481688150e8 |
line wrap: on
line diff
--- a/src/main/java/de/intevation/lada/util/auth/HeaderAuthorization.java Fri Jan 08 12:20:31 2016 +0100 +++ b/src/main/java/de/intevation/lada/util/auth/HeaderAuthorization.java Thu Jan 21 09:01:57 2016 +0100 @@ -92,9 +92,7 @@ HttpServletRequest request = (HttpServletRequest)source; String roleString = request.getAttribute("lada.user.roles").toString(); - String[] roles = roleString.split(","); UserInfo info = getGroupsFromDB(roleString); - info.setRoles(new ArrayList<String>(Arrays.asList(roles))); info.setName(request.getAttribute("lada.user.name").toString()); return info; } @@ -170,27 +168,8 @@ Response response = repository.filter(builder.getQuery(), "stamm"); @SuppressWarnings("unchecked") List<Auth> auth = (List<Auth>)response.getData(); - List<String> netzbetreiber = new ArrayList<String>(); - List<String> messstellen = new ArrayList<String>(); - List<Integer> funktionen = new ArrayList<Integer>(); - for (Auth a : auth) { - if (a.getNetzbetreiberId() != null) { - netzbetreiber.add(a.getNetzbetreiberId()); - } - if (a.getMstId() != null) { - messstellen.add(a.getMstId()); - } - if (a.getLaborMstId() != null) { - messstellen.add(a.getLaborMstId()); - } - if (a.getFunktionId() != null) { - funktionen.add(a.getFunktionId()); - } - } UserInfo userInfo = new UserInfo(); - userInfo.setNetzbetreiber(netzbetreiber); - userInfo.setMessstellen(messstellen); - userInfo.setFunktionen(funktionen); + userInfo.setAuth(auth); return userInfo; } @@ -213,7 +192,7 @@ List<LMessung> messungen = (List<LMessung>) response.getData(); for (int i = 0; i < messungen.size(); i++) { if (messungen.get(i).getStatus() == null) { - return false; + continue; } LStatusProtokoll status = repository.getByIdPlain( LStatusProtokoll.class, messungen.get(i).getStatus(), "land");