Skip to content
Snippets Groups Projects
Commit 55432f71 authored by Sonia Zorba's avatar Sonia Zorba
Browse files

Bugfix GroupStatusManager

parent 8d18a841
No related branches found
No related tags found
No related merge requests found
Pipeline #681 passed
...@@ -46,7 +46,7 @@ public class GroupStatusManager extends UserAwareComponent { ...@@ -46,7 +46,7 @@ public class GroupStatusManager extends UserAwareComponent {
Permission groupPermission = permissionsManager.getCurrentUserPermission(parentGroup); Permission groupPermission = permissionsManager.getCurrentUserPermission(parentGroup);
if (Permission.includes(Permission.VIEW_MEMBERS, groupPermission)) { if (!Permission.includes(groupPermission, Permission.VIEW_MEMBERS)) {
throw new UnauthorizedException("VIEW_MEMBERS permission is needed for performing this action"); throw new UnauthorizedException("VIEW_MEMBERS permission is needed for performing this action");
} }
...@@ -82,6 +82,7 @@ public class GroupStatusManager extends UserAwareComponent { ...@@ -82,6 +82,7 @@ public class GroupStatusManager extends UserAwareComponent {
for (int i = 0; i < groups.size(); i++) { for (int i = 0; i < groups.size(); i++) {
GroupEntity group = groups.get(i); GroupEntity group = groups.get(i);
String groupName = names.get(group.getId()); String groupName = names.get(group.getId());
if (groupName != null) {
List<String> users = membersMap.get(group.getId()); List<String> users = membersMap.get(group.getId());
if (users != null) { if (users != null) {
for (String userId : users) { for (String userId : users) {
...@@ -95,6 +96,7 @@ public class GroupStatusManager extends UserAwareComponent { ...@@ -95,6 +96,7 @@ public class GroupStatusManager extends UserAwareComponent {
} }
} }
} }
}
Collections.sort(rows, (r1, r2) -> (r1[0]).compareTo(r2[0])); Collections.sort(rows, (r1, r2) -> (r1[0]).compareTo(r2[0]));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment