From af355ec096c85f54f61bb22518449315b6f7bf55 Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Sun, 9 Aug 2015 13:47:49 -0500
Subject: [PATCH] * get activeadmin working for JamTracks after onboarding
 enhancements were added

---
 admin/app/admin/jam_tracks.rb                    | 14 ++++++++++++--
 admin/app/views/admin/jam_tracks/_form.html.slim |  2 +-
 ruby/lib/jam_ruby/models/jam_track.rb            |  2 +-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/admin/app/admin/jam_tracks.rb b/admin/app/admin/jam_tracks.rb
index d51e92f31..2e8422305 100644
--- a/admin/app/admin/jam_tracks.rb
+++ b/admin/app/admin/jam_tracks.rb
@@ -24,11 +24,21 @@ ActiveAdmin.register  JamRuby::JamTrack, :as => 'JamTracks' do
 
     column :original_artist
     column :name
-    column :onboarding_flags do |jam_track| jam_track.onboard_warnings end
+    column :onboarding_exceptions do |jam_track|
+      if jam_track.onboarding_exceptions
+        exceptions = JSON.parse(jam_track.onboarding_exceptions)
+        exceptions.keys.join(',')
+      else
+      ''
+      end
+
+    end
     column :status
     column :master_track do |jam_track| jam_track.master_track.nil? ? 'None' : (link_to "Download", jam_track.master_track.url_by_sample_rate(44)) end
     column :licensor
-    column :genre
+    column :genres do |jam_track|
+      jam_track.genres.map(&:description).join(',')
+    end
     column :price
     column :reproduction_royalty
     column :public_performance_royalty
diff --git a/admin/app/views/admin/jam_tracks/_form.html.slim b/admin/app/views/admin/jam_tracks/_form.html.slim
index 51341d812..334cdc27e 100644
--- a/admin/app/views/admin/jam_tracks/_form.html.slim
+++ b/admin/app/views/admin/jam_tracks/_form.html.slim
@@ -12,7 +12,7 @@
     = f.input :songwriter, :input_html => { :rows=>1, :maxlength=>1000 }
     = f.input :publisher, :input_html => { :rows=>1, :maxlength=>1000 }
     = f.input :licensor, collection: JamRuby::JamTrackLicensor.all, include_blank: true
-    = f.input :genre, collection: JamRuby::Genre.all, include_blank: false
+    = f.input :genres
     = f.input :duration, hint: 'this should rarely need editing because it comes from the import process'
     = f.input :sales_region, collection: JamRuby::JamTrack::SALES_REGION, include_blank: false
     = f.input :price, :required => true, :input_html => {type: 'numeric'}
diff --git a/ruby/lib/jam_ruby/models/jam_track.rb b/ruby/lib/jam_ruby/models/jam_track.rb
index 3338124be..2352d0af4 100644
--- a/ruby/lib/jam_ruby/models/jam_track.rb
+++ b/ruby/lib/jam_ruby/models/jam_track.rb
@@ -17,7 +17,7 @@ module JamRuby
                   :original_artist, :songwriter, :publisher, :licensor, :licensor_id, :pro, :genres_jam_tracks_attributes, :sales_region, :price,
                   :reproduction_royalty, :public_performance_royalty, :reproduction_royalty_amount,
                   :licensor_royalty_amount, :pro_royalty_amount, :plan_code, :initial_play_silence, :jam_track_tracks_attributes,
-                  :jam_track_tap_ins_attributes, :version, :jmep_json, :jmep_text, :pro_ascap, :pro_bmi, :pro_sesac, :duration,  as: :admin
+                  :jam_track_tap_ins_attributes, :genre_ids, :version, :jmep_json, :jmep_text, :pro_ascap, :pro_bmi, :pro_sesac, :duration,  as: :admin
 
     validates :name,            presence: true, uniqueness: true, length: {maximum: 200}
     validates :plan_code,       presence: true, uniqueness: true, length: {maximum: 50  }