From: Jean-Baptiste Lievremont Date: Wed, 3 Jun 2015 12:05:30 +0000 (+0200) Subject: SONAR-6470 Add group ID in api/users/groups response X-Git-Tag: 5.2-RC1~1656 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=00c361c7ac7032214792766ecb83caeb769ec42d;p=sonarqube.git SONAR-6470 Add group ID in api/users/groups response --- diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/GroupsAction.java b/server/sonar-server/src/main/java/org/sonar/server/user/ws/GroupsAction.java index b713e9a6ed2..df070a60d92 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/GroupsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/user/ws/GroupsAction.java @@ -40,6 +40,7 @@ public class GroupsAction implements UsersWsAction { private static final String PARAM_LOGIN = "login"; + private static final String FIELD_ID = "id"; private static final String FIELD_NAME = "name"; private static final String FIELD_DESCRIPTION = "description"; private static final String FIELD_SELECTED = "selected"; @@ -110,6 +111,7 @@ public class GroupsAction implements UsersWsAction { json.name("groups").beginArray(); for (GroupMembershipDto group : groups) { json.beginObject() + .prop(FIELD_ID, group.getId().toString()) .prop(FIELD_NAME, group.getName()) .prop(FIELD_DESCRIPTION, group.getDescription()) .prop(FIELD_SELECTED, group.getUserId() != null) diff --git a/server/sonar-server/src/main/resources/org/sonar/server/user/ws/example-groups.json b/server/sonar-server/src/main/resources/org/sonar/server/user/ws/example-groups.json index ef1ca05b086..52a39b53438 100644 --- a/server/sonar-server/src/main/resources/org/sonar/server/user/ws/example-groups.json +++ b/server/sonar-server/src/main/resources/org/sonar/server/user/ws/example-groups.json @@ -3,7 +3,7 @@ "ps": 25, "total": 2, "groups": [ - {"name": "sonar-admins", "description": "Sonar Admins", "selected": false}, - {"name": "sonar-users", "description": "Sonar Users", "selected": true} + {"id": "2", "name": "sonar-admins", "description": "Sonar Admins", "selected": false}, + {"id": "1", "name": "sonar-users", "description": "Sonar Users", "selected": true} ] }