diff --git a/ruby/lib/jam_ruby/models/jam_track_right.rb b/ruby/lib/jam_ruby/models/jam_track_right.rb index 35edf486f..fbd97bc78 100644 --- a/ruby/lib/jam_ruby/models/jam_track_right.rb +++ b/ruby/lib/jam_ruby/models/jam_track_right.rb @@ -87,8 +87,8 @@ module JamRuby end JamTrack.select('jam_tracks.id, jam_track_rights.private_key AS private_key, jam_track_rights.id AS jam_track_right_id') - .joins("LEFT OUTER JOIN jam_track_rights ON jam_tracks.id = jam_track_rights.jam_track_id") - .where('jam_tracks.id IN (?) AND jam_track_rights.user_id=?', jamtracks, user) + .joins("LEFT OUTER JOIN jam_track_rights ON jam_tracks.id = jam_track_rights.jam_track_id AND jam_track_rights.user_id = '#{user.id}'") + .where('jam_tracks.id IN (?)', jamtracks) end end diff --git a/ruby/spec/jam_ruby/models/jam_track_right_spec.rb b/ruby/spec/jam_ruby/models/jam_track_right_spec.rb index ef279c56f..2936fd8d4 100644 --- a/ruby/spec/jam_ruby/models/jam_track_right_spec.rb +++ b/ruby/spec/jam_ruby/models/jam_track_right_spec.rb @@ -105,13 +105,12 @@ describe JamTrackRight do end it "bogus key" do - JamTrackRight.list_keys(user, 2112).should eq([]) + JamTrackRight.list_keys(user, ['a']).should eq([]) end it "valid track with no rights to it by querying user" do jam_track = FactoryGirl.create(:jam_track) - user2 = FactoryGirl.create(:user) - keys = JamTrackRight.list_keys(user2, [jam_track.id]) + keys = JamTrackRight.list_keys(user, [jam_track.id]) keys.length.should == 0 end