Merge branch 'feature/jam_tracks_refund' into feature/jam_track_ui_2

This commit is contained in:
Steven Miers 2015-02-24 08:11:41 -06:00
commit 2cb6fe8652
2 changed files with 6 additions and 0 deletions

View File

@ -0,0 +1,5 @@
= f.inputs name: 'Jam Track Right fields' do
ol.nested-fields
= f.input :jam_track, :required=>true, collection: JamTrack.all, include_blank: false
= f.input :user, :required=>true, collection: User.all, include_blank: false

View File

@ -4,6 +4,7 @@ module JamRuby
class JamTrackRight < ActiveRecord::Base
include JamRuby::S3ManagerMixin
attr_accessible :user, :jam_track, :user_id, :jam_track_id, :url, :md5, :length, :download_count
attr_accessible :user_id, :jam_track_id, as: :admin
belongs_to :user, class_name: "JamRuby::User" # the owner, or purchaser of the jam_track
belongs_to :jam_track, class_name: "JamRuby::JamTrack"