summaryrefslogtreecommitdiffstats
path: root/server/sonar-web/src/main/webapp
diff options
context:
space:
mode:
Diffstat (limited to 'server/sonar-web/src/main/webapp')
-rw-r--r--server/sonar-web/src/main/webapp/WEB-INF/app/controllers/user_groups_controller.rb14
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