From 0bda6384e7f519b1e738bafda5ad26354cd090da Mon Sep 17 00:00:00 2001 From: Seth Call Date: Fri, 24 Oct 2014 12:49:34 -0500 Subject: [PATCH] * try to fix broken tests --- web/app/views/api_music_sessions/show.rabl | 50 +++++++++++----------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/web/app/views/api_music_sessions/show.rabl b/web/app/views/api_music_sessions/show.rabl index 274246985..2ecb2880a 100644 --- a/web/app/views/api_music_sessions/show.rabl +++ b/web/app/views/api_music_sessions/show.rabl @@ -67,43 +67,41 @@ else end # only show currently playing recording data if the current_user is in the session - node(:claimed_recording, :if => lambda { |music_session| music_session.users.exists?(current_user) } ) do |music_session| - child(:claimed_recording => :claimed_recording) { - attributes :id, :name, :description, :is_public + child({:claimed_recording => :claimed_recording}, :if => lambda { |music_session| music_session.users.exists?(current_user) }) { + attributes :id, :name, :description, :is_public - child(:recording => :recording) { - attributes :id, :created_at, :duration - child(:band => :band) { - attributes :id, :name - } + child(:recording => :recording) { + attributes :id, :created_at, :duration + child(:band => :band) { + attributes :id, :name + } - child(:mixes => :mixes) { - attributes :id, :is_completed + child(:mixes => :mixes) { + attributes :id, :is_completed - node :mp3_url do |mix| - mix[:mp3_url] - end + node :mp3_url do |mix| + mix[:mp3_url] + end - node :ogg_url do |mix| - mix[:ogg_url] - end - } + node :ogg_url do |mix| + mix[:ogg_url] + end + } - child(:recorded_tracks => :recorded_tracks) { - attributes :id, :fully_uploaded, :client_track_id, :client_id, :instrument_id + child(:recorded_tracks => :recorded_tracks) { + attributes :id, :fully_uploaded, :client_track_id, :client_id, :instrument_id - node :url do |recorded_track| - recorded_track[:url] - end + node :url do |recorded_track| + recorded_track[:url] + end - child(:user => :user) { - attributes :id, :first_name, :last_name, :city, :state, :country, :photo_url - } + child(:user => :user) { + attributes :id, :first_name, :last_name, :city, :state, :country, :photo_url } } } - end + } # only show mount info if fan_access is public. Eventually we'll also need to show this in other scenarios, like if invited child({:mount => :mount}, :if => lambda { |music_session| music_session.fan_access}) {