From 705e67a810a657870e13818f2fa37ad476e2f49d Mon Sep 17 00:00:00 2001 From: Steven Miers Date: Thu, 16 Apr 2015 00:21:45 -0500 Subject: [PATCH] VRFS-2874 : Clean up code and logic - fixes problem of false positive. --- ruby/lib/jam_ruby/models/recording.rb | 2 +- web/app/assets/javascripts/ga.js | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ruby/lib/jam_ruby/models/recording.rb b/ruby/lib/jam_ruby/models/recording.rb index 43470c016..16b0aa1dd 100644 --- a/ruby/lib/jam_ruby/models/recording.rb +++ b/ruby/lib/jam_ruby/models/recording.rb @@ -3,7 +3,7 @@ module JamRuby @@log = Logging.logger[Recording] - attr_accessible :owner, :owner_id, :band, :band_id, :recorded_tracks_attributes, :mixes_attributes, :claimed_recordings_attributes, :name, :description, :genre, :is_public, :duration, as: :admin + attr_accessible :owner, :owner_id, :band, :band_id, :recorded_tracks_attributes, :mixes_attributes, :claimed_recordings_attributes, :name, :description, :genre, :is_public, :duration, :jam_track_id, as: :admin has_many :users, :through => :recorded_tracks, :class_name => "JamRuby::User" has_many :claimed_recordings, :class_name => "JamRuby::ClaimedRecording", :inverse_of => :recording, :foreign_key => 'recording_id', :dependent => :destroy diff --git a/web/app/assets/javascripts/ga.js b/web/app/assets/javascripts/ga.js index cb297b28c..8e51a081e 100644 --- a/web/app/assets/javascripts/ga.js +++ b/web/app/assets/javascripts/ga.js @@ -256,13 +256,13 @@ function trackJamTrackPlaySession(sessionId, inSession) { rest.getSession(sessionId).done(function(session) { - if (session && session.jam_track_id && typeof(session.jam_track_id)!='undefined') { - rest.getJamTracks({id:session.jam_track_id}).done(function(response) { - if (response.jamtracks && response.jamtracks.length==1) { + if (session && session.jam_track ) { + rest.getJamTracks({id:session.jam_track.id}).done(function(response) { + if (response.jamtracks && response.jamtracks.length!=0) { var jamtrack = response.jamtracks[0] trackJamTrackPlay( jamtrack.sales_region!=context.JK.AVAILABILITY_US, - session.participants.length > 0, + session.participants.length > 1, inSession); }// if })// rest.getJamTracks