diff options
author | Stas Vilchik <vilchiks@gmail.com> | 2014-08-25 15:24:43 +0600 |
---|---|---|
committer | Stas Vilchik <vilchiks@gmail.com> | 2014-08-25 15:24:43 +0600 |
commit | b8fdcad2f7be7e315ef5918d71990abf8eec52c9 (patch) | |
tree | 0f5715c348f9f922f503f706adfc0fecd9a4c1e0 /server | |
parent | 4eb379fa50f6777db4272055bcfba2e905e8352e (diff) | |
download | sonarqube-b8fdcad2f7be7e315ef5918d71990abf8eec52c9.tar.gz sonarqube-b8fdcad2f7be7e315ef5918d71990abf8eec52c9.zip |
SONAR-4593 Display group description in User window
Fix the issue with the empty group description
Diffstat (limited to 'server')
-rw-r--r-- | server/sonar-web/src/main/webapp/WEB-INF/app/views/users/_select_group.html.erb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/users/_select_group.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/users/_select_group.html.erb index bbc66378887..e55c18626fd 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/users/_select_group.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/users/_select_group.html.erb @@ -14,7 +14,13 @@ var selectList = new SelectList({ el: '#select-list-user', width: '100%', - format: function (item) { return item.name + ' <div class="subtitle">' + item.description + '</div>'; }, + format: function (item) { + var label = item.name; + if (item.description) { + label += ' <div class="subtitle">' + item.description + '</div>' + } + return label; + }, searchUrl: baseUrl + '/user_groups/search?user=<%= @user.login -%>', selectUrl: baseUrl + '/groups/add_member', deselectUrl: baseUrl + '/groups/remove_member', |