From f4cd22514252dba11ea9eb459c5ee2b3e98d0aef Mon Sep 17 00:00:00 2001 From: Steven Miers Date: Sun, 15 Mar 2015 19:45:58 -0500 Subject: [PATCH] VRFS-2823 : Bugfix and cleanup. --- ruby/lib/jam_ruby/models/jam_track.rb | 1 - web/app/assets/javascripts/jamtrack.coffee | 6 +++--- web/app/views/clients/_jamtrack.html.slim | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ruby/lib/jam_ruby/models/jam_track.rb b/ruby/lib/jam_ruby/models/jam_track.rb index e7f5aaeb0..33da321c3 100644 --- a/ruby/lib/jam_ruby/models/jam_track.rb +++ b/ruby/lib/jam_ruby/models/jam_track.rb @@ -86,7 +86,6 @@ module JamRuby end if options[:artist].present? - puts "Checking artist #{options[:artist]}" query = query.where("original_artist=?", options[:artist]) end diff --git a/web/app/assets/javascripts/jamtrack.coffee b/web/app/assets/javascripts/jamtrack.coffee index 7c41af0a6..5811194f6 100644 --- a/web/app/assets/javascripts/jamtrack.coffee +++ b/web/app/assets/javascripts/jamtrack.coffee @@ -71,8 +71,8 @@ context.JK.JamTrackScreen=class JamTrackScreen that.handleJamtrackResponse(response) ).fail (jqXHR) -> that.clearResults() - @noMoreJamtracks.show() - @app.notifyServerError jqXHR, 'Jamtrack Unavailable' + that.noMoreJamtracks.show() + that.app.notifyServerError jqXHR, 'Jamtrack Unavailable' search:() => this.refresh() @@ -219,7 +219,7 @@ context.JK.JamTrackScreen=class JamTrackScreen @instrument = @screen.find('#jamtrack_instrument') @availability = @screen.find('#jamtrack_availability') @nextPager = @screen.find('a.btn-next-pager') - @noMoreJamtracks = @screen.find('#end-of-jamtrack-list') + @noMoreJamtracks = @screen.find('.end-of-jamtrack-list') if @screen.length == 0 throw new Error('@screen must be specified') if @scroller.length == 0 diff --git a/web/app/views/clients/_jamtrack.html.slim b/web/app/views/clients/_jamtrack.html.slim index 99c7a0c44..cc7ee4cfe 100644 --- a/web/app/views/clients/_jamtrack.html.slim +++ b/web/app/views/clients/_jamtrack.html.slim @@ -12,7 +12,7 @@ .profile-wrapper .jamtrack-content a.btn-next-pager href="/api/jamtracks?page=1" Next - #end-of-jamtrack-list.end-of-list="No more Jamtracks" + .end-of-jamtrack-list.end-of-list="No more Jamtracks" script type='text/template' id='template-jamtrack' .jamtrack-record jamtrack-id="{{data.jamtrack.id}}"