From: Stas Vilchik <vilchiks@gmail.com>
Date: Mon, 25 Aug 2014 09:24:43 +0000 (+0600)
Subject: SONAR-4593 Display group description in User window
X-Git-Tag: 4.5-RC1~112
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b8fdcad2f7be7e315ef5918d71990abf8eec52c9;p=sonarqube.git

SONAR-4593 Display group description in User window

Fix the issue with the empty group description
---

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',