From 1de7c86e29db17c5c558d38065a9f9e582f1f6bf Mon Sep 17 00:00:00 2001 From: Steven Miers Date: Wed, 25 Feb 2015 09:41:03 -0600 Subject: [PATCH 1/2] VRFS-2785 : Fields for new purchased jam track. --- .../views/admin/jam_tracks/_jam_track_right_fields.html.slim | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 admin/app/views/admin/jam_tracks/_jam_track_right_fields.html.slim diff --git a/admin/app/views/admin/jam_tracks/_jam_track_right_fields.html.slim b/admin/app/views/admin/jam_tracks/_jam_track_right_fields.html.slim new file mode 100644 index 000000000..9bf130e56 --- /dev/null +++ b/admin/app/views/admin/jam_tracks/_jam_track_right_fields.html.slim @@ -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 From 9c9c01b2fd9eb2b893407969990e0ae272691ec6 Mon Sep 17 00:00:00 2001 From: Steven Miers Date: Wed, 25 Feb 2015 09:41:51 -0600 Subject: [PATCH 2/2] VRFS-2785 : Make id fields accessible for admin UI. --- ruby/lib/jam_ruby/models/jam_track_right.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/ruby/lib/jam_ruby/models/jam_track_right.rb b/ruby/lib/jam_ruby/models/jam_track_right.rb index affee58a5..b8bf19047 100644 --- a/ruby/lib/jam_ruby/models/jam_track_right.rb +++ b/ruby/lib/jam_ruby/models/jam_track_right.rb @@ -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"