diff options
| author | Julien Lancelot <julien.lancelot@sonarsource.com> | 2014-08-05 15:21:25 +0200 |
|---|---|---|
| committer | Julien Lancelot <julien.lancelot@sonarsource.com> | 2014-08-05 15:21:34 +0200 |
| commit | 42d098015ceadafb673aaf3f12c718c00e52b857 (patch) | |
| tree | ed51d4aed555f21249c151636a53f3c35c123666 /server/sonar-web | |
| parent | 100c7138734b67187175f38a0f85bebc71794087 (diff) | |
| download | sonarqube-42d098015ceadafb673aaf3f12c718c00e52b857.tar.gz sonarqube-42d098015ceadafb673aaf3f12c718c00e52b857.zip | |
SONAR-4963 Return group description in /user_groups/search
Diffstat (limited to 'server/sonar-web')
| -rw-r--r-- | server/sonar-web/src/main/webapp/WEB-INF/app/controllers/user_groups_controller.rb | 14 |
1 files changed, 9 insertions, 5 deletions
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 |