commit 293ee035aee1aef9eff538ff1cdf2eeb4f170762
author margaretha <margaretha@ids-mannheim.de> Tue Mar 20 20:11:52 2018 +0100
committer margaretha <margaretha@ids-mannheim.de> Wed Mar 21 12:04:55 2018 +0100
tree 292572bca3ba161290b3f49fdcd459cd23b60fa3
parent cf4b26f68a166f908bf21f768584b735833f46bf

Added list group controller for system admin & status to user-group DTO.

Change-Id: I628008322472c3910088ea7c17db137d7b3aec87

full/src/main/java/de/ids_mannheim/korap/dto/converter/UserGroupConverter.java

diff --git a/full/src/main/java/de/ids_mannheim/korap/dto/converter/UserGroupConverter.java b/full/src/main/java/de/ids_mannheim/korap/dto/converter/UserGroupConverter.java
index 9dd4df9..0ee2912 100644
--- a/full/src/main/java/de/ids_mannheim/korap/dto/converter/UserGroupConverter.java
+++ b/full/src/main/java/de/ids_mannheim/korap/dto/converter/UserGroupConverter.java
@@ -29,14 +29,17 @@
         UserGroupDto dto = new UserGroupDto();
         dto.setId(group.getId());
         dto.setName(group.getName());
+        dto.setStatus(group.getStatus());
         dto.setOwner(group.getCreatedBy());
         dto.setUserMemberStatus(userMemberStatus);
 
-        List<String> roles = new ArrayList<>(userRoles.size());
-        for (Role r : userRoles) {
-            roles.add(r.getName());
+        if (userRoles != null) {
+            List<String> roles = new ArrayList<>(userRoles.size());
+            for (Role r : userRoles) {
+                roles.add(r.getName());
+            }
+            dto.setUserRoles(roles);
         }
-        dto.setUserRoles(roles);
 
         if (members != null) {
             ArrayList<UserGroupMemberDto> memberDtos =