Revert change.

This commit is contained in:
Steven Miers 2015-01-05 19:03:28 -06:00
parent eb990dd930
commit f677714e9a
2 changed files with 5 additions and 2 deletions

View File

@ -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 AND jam_track_rights.user_id = '#{user.id}'")
.where('jam_tracks.id IN (?)', jamtracks)
.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)
end
end

View File

@ -124,13 +124,16 @@ describe ApiJamTracksController do
response.status.should == 200
json = JSON.parse(response.body)
json.length.should == 1
puts json.inspect
json[0]['id'].should == @jam_track.id
json[0]['private'].should be_nil
json[0]['error'].should == 'not_purchased'
end
it "track with no key" do
right = FactoryGirl.create(:jam_track_right, user: @user, private_key: nil, jam_track: @jam_track)
get :keys, jamtracks: [@jam_track.id]
response.status.should == 200
json = JSON.parse(response.body)