diff --git a/web/app/assets/javascripts/hoverMusician.js b/web/app/assets/javascripts/hoverMusician.js
index 56042effd..5377ceb31 100644
--- a/web/app/assets/javascripts/hoverMusician.js
+++ b/web/app/assets/javascripts/hoverMusician.js
@@ -23,6 +23,11 @@
instrumentHtml += '
';
});
+ var genreHtml = '';
+ $.each(response.genres, function(index, val) {
+ genreHtml += val.description + ' ';
+ });
+
// followings
var followingHtml = '';
$.each(response.followings, function(index, val) {
@@ -99,6 +104,7 @@
first_name: response.first_name,
location: response.location,
instruments: instrumentHtml,
+ genres: genreHtml,
friend_count: response.friend_count,
follower_count: response.follower_count,
recording_count: response.recording_count,
diff --git a/web/app/assets/javascripts/profile.js b/web/app/assets/javascripts/profile.js
index edd6187d2..49543492d 100644
--- a/web/app/assets/javascripts/profile.js
+++ b/web/app/assets/javascripts/profile.js
@@ -354,6 +354,10 @@
$('#profile-instruments').append(instrumentHtml);
}
}
+ $('#profile-genres').empty();
+ for (var i=0; i< user.genres.length; i++) {
+ $('#profile-genres').append(user.genres[i].description + '
');
+ }
// location
$('#profile-location').html(user.location);
diff --git a/web/app/views/clients/_hoverMusician.html.erb b/web/app/views/clients/_hoverMusician.html.erb
index c92db5704..bc88742b8 100644
--- a/web/app/views/clients/_hoverMusician.html.erb
+++ b/web/app/views/clients/_hoverMusician.html.erb
@@ -101,6 +101,7 @@
{name}
{location}
{instruments}
+ {genres}
{friend_count}
{follower_count}
@@ -134,4 +135,4 @@
-
\ No newline at end of file
+
diff --git a/web/app/views/clients/_profile.html.erb b/web/app/views/clients/_profile.html.erb
index 1d11fdf35..2316b7730 100644
--- a/web/app/views/clients/_profile.html.erb
+++ b/web/app/views/clients/_profile.html.erb
@@ -83,6 +83,8 @@
+
+