From 801504be2bb781ac8539c87411f8c438f9d38756 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Fri, 16 Oct 2015 14:56:54 -0500 Subject: [PATCH] * fixing bug when referencing name instead of first/last for feed --- ruby/lib/jam_ruby/models/music_session_user_history.rb | 4 ++++ .../react-components/PopupJamTrackPlayer.js.jsx.coffee | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ruby/lib/jam_ruby/models/music_session_user_history.rb b/ruby/lib/jam_ruby/models/music_session_user_history.rb index 86d132025..c6f73a308 100644 --- a/ruby/lib/jam_ruby/models/music_session_user_history.rb +++ b/ruby/lib/jam_ruby/models/music_session_user_history.rb @@ -21,6 +21,10 @@ module JamRuby .first end + def name + user.name + end + def music_session @msh ||= JamRuby::MusicSession.find_by_music_session_id(self.music_session_id) end diff --git a/web/app/assets/javascripts/react-components/PopupJamTrackPlayer.js.jsx.coffee b/web/app/assets/javascripts/react-components/PopupJamTrackPlayer.js.jsx.coffee index bda08b8d2..d501df63c 100644 --- a/web/app/assets/javascripts/react-components/PopupJamTrackPlayer.js.jsx.coffee +++ b/web/app/assets/javascripts/react-components/PopupJamTrackPlayer.js.jsx.coffee @@ -656,7 +656,7 @@ mixins.push(Reflux.listenTo(JamTrackPlayerStore, 'onJamTrackPlayerStoreChanged') @fetchUserInfo() ) .fail((jqXHR) => - alert("unable to fetch JamTrack information") + alert("Unable to fetch JamTrack information. Try logging in.") ) fetchUserInfo: () ->