From e3d521e07a00423380d9fa787461489bfaa8c647 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Wed, 18 Jun 2014 08:09:36 -0500 Subject: [PATCH] * adding in session.name to show.rabl and history_show.rabl --- ruby/lib/jam_ruby/models/active_music_session.rb | 4 ++++ web/app/views/api_music_sessions/history_show.rabl | 2 +- web/app/views/api_music_sessions/show.rabl | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ruby/lib/jam_ruby/models/active_music_session.rb b/ruby/lib/jam_ruby/models/active_music_session.rb index 248879bbc..d93ca4b8c 100644 --- a/ruby/lib/jam_ruby/models/active_music_session.rb +++ b/ruby/lib/jam_ruby/models/active_music_session.rb @@ -426,6 +426,10 @@ module JamRuby music_session.description end + def name + music_session.name + end + def genre music_session.genre end diff --git a/web/app/views/api_music_sessions/history_show.rabl b/web/app/views/api_music_sessions/history_show.rabl index 40a5bbc52..5349b788d 100644 --- a/web/app/views/api_music_sessions/history_show.rabl +++ b/web/app/views/api_music_sessions/history_show.rabl @@ -16,7 +16,7 @@ if !current_user } else - attributes :id, :music_session_id, :description, :musician_access, :approval_required, :fan_access, :fan_chat, + attributes :id, :music_session_id, :name, :description, :musician_access, :approval_required, :fan_access, :fan_chat, :band_id, :user_id, :genre_id, :created_at, :like_count, :comment_count node :share_url do |history| diff --git a/web/app/views/api_music_sessions/show.rabl b/web/app/views/api_music_sessions/show.rabl index deed7e064..1eebd1728 100644 --- a/web/app/views/api_music_sessions/show.rabl +++ b/web/app/views/api_music_sessions/show.rabl @@ -13,7 +13,7 @@ if !current_user } else - attributes :id, :description, :musician_access, :approval_required, :fan_access, :fan_chat, :band_id, :user_id, :claimed_recording_initiator_id, :track_changes_counter, :max_score + attributes :id, :name, :description, :musician_access, :approval_required, :fan_access, :fan_chat, :band_id, :user_id, :claimed_recording_initiator_id, :track_changes_counter, :max_score node :genres do |item| [item.genre.description] # XXX: need to return single genre; not array