SONAR-4963 Return group description in /user_groups/search

2 files changed, 11 insertions, 6 deletions

diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/GroupMembershipFinderTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/GroupMembershipFinderTest.java
index 62da695d7d7..581eaa863be 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/user/GroupMembershipFinderTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/user/GroupMembershipFinderTest.java
@@ -48,7 +48,7 @@ public class GroupMembershipFinderTest {
   public void find() throws Exception {
     GroupMembershipQuery query = GroupMembershipQuery.builder().login("arthur").build();
     when(groupMembershipDao.selectGroups(eq(query), anyLong(), anyInt(), anyInt())).thenReturn(
-      newArrayList(new GroupMembershipDto().setId(1L).setName("users").setUserId(100L))
+      newArrayList(new GroupMembershipDto().setId(1L).setName("users").setDescription("Users group").setUserId(100L))
     );
 
     GroupMembershipFinder.Membership result = finder.find(query);
@@ -58,6 +58,7 @@ public class GroupMembershipFinderTest {
     GroupMembership group = result.groups().get(0);
     assertThat(group.id()).isEqualTo(1);
     assertThat(group.name()).isEqualTo("users");
+    assertThat(group.description()).isEqualTo("Users group");
     assertThat(group.isMember()).isTrue();
   }
 
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/user_groups_controller.rb b/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/user_groups_controller.rb
index 90cd2dc0ec8..94a4671a614 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/user_groups_controller.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/user_groups_controller.rb
@@ -33,11 +33,15 @@ class UserGroupsController < ApplicationController
       format.json {
         render :json => {
             :more => more,
-            :results => groups.map { |group| {
-                :id => group.id(),
-                :name => group.name(),
-                :selected => group.isMember()
-            }}
+            :results => groups.map { |group|
+              hash = {
+                  :id => group.id(),
+                  :name => group.name(),
+                  :selected => group.isMember()
+              }
+              hash[:description] = group.description() if group.description() && !group.description().blank?
+              hash
+            }
         }
       }
     end