diff --git a/web/app/assets/javascripts/findSession.js b/web/app/assets/javascripts/findSession.js index 3c31d585a..63f41270e 100644 --- a/web/app/assets/javascripts/findSession.js +++ b/web/app/assets/javascripts/findSession.js @@ -276,14 +276,11 @@ function renderSession(sessionId) { // store session in the appropriate bucket and increment category counts var session = sessions[sessionId]; - if (containsInvitation(session)) { - activeSessionGroup[sessionId] = session; - sessionCounts[CATEGORY.ACTIVE.index]++; - } - else if (containsFriend(session)) { - scheduledSessionGroup[sessionId] = session; - sessionCounts[CATEGORY.SCHEDULED.index]++; - } + activeSessionGroup[sessionId] = session; + sessionCounts[CATEGORY.ACTIVE.index]++; + + scheduledSessionGroup[sessionId] = session; + sessionCounts[CATEGORY.SCHEDULED.index]++; // hack to prevent duplicate rows from being rendered when filtering var sessionAlreadyRendered = false; diff --git a/web/app/views/api_music_sessions/show_history.rabl b/web/app/views/api_music_sessions/show_history.rabl index 274ca4e51..9358fcf5d 100644 --- a/web/app/views/api_music_sessions/show_history.rabl +++ b/web/app/views/api_music_sessions/show_history.rabl @@ -87,7 +87,11 @@ else } child({:open_slots => :open_slots}) { - attributes :id, :instrument_id, :proficiency_level, :proficiency_desc :music_session_id + attributes :id, :instrument_id, :proficiency_level, :proficiency_desc + } + + child({:pending_invitations => :pending_invitations}) { + attributes :id, :email, :photo_url } child(:active_music_session => :active_music_session) { diff --git a/web/app/views/clients/_sessionList.html.erb b/web/app/views/clients/_sessionList.html.erb index db3bec657..eb4734fb2 100644 --- a/web/app/views/clients/_sessionList.html.erb +++ b/web/app/views/clients/_sessionList.html.erb @@ -6,7 +6,7 @@