diff --git a/admin/app/admin/affiliate_users.rb b/admin/app/admin/affiliate_users.rb index b21d512eb..f500a2565 100644 --- a/admin/app/admin/affiliate_users.rb +++ b/admin/app/admin/affiliate_users.rb @@ -7,10 +7,10 @@ ActiveAdmin.register JamRuby::User, :as => 'Referrals' do config.filters = false index do - column 'User' do |oo| link_to(oo.name, "http://www.jamkazam.com/client#/profile/#{oo.id}", {:title => oo.name}) end + column 'User' do |oo| link_to(oo.name, oo.admin_url, {:title => oo.name}) end column 'Email' do |oo| oo.email end column 'Created' do |oo| oo.created_at end - column 'Partner' do |oo| oo.affiliate_referral.partner_name end + column 'Partner' do |oo| oo.affiliate_referral.display_name end end controller do diff --git a/ruby/lib/jam_ruby/jam_track_importer.rb b/ruby/lib/jam_ruby/jam_track_importer.rb index 0a5785fc6..a92aca61b 100644 --- a/ruby/lib/jam_ruby/jam_track_importer.rb +++ b/ruby/lib/jam_ruby/jam_track_importer.rb @@ -1248,9 +1248,10 @@ module JamRuby if track.original_audio_s3_path.nil? - @@log.error("jam_track #{jam_track.name} has empty stem. stem: #{track.id}" + @@log.error("jam_track #{jam_track.name} has empty stem. stem: #{track.id}") next end + basename = File.basename(track.original_audio_s3_path) s3_dirname = File.dirname(track.original_audio_s3_path) diff --git a/ruby/lib/jam_ruby/models/affiliate_partner.rb b/ruby/lib/jam_ruby/models/affiliate_partner.rb index 4408ffa42..61ab30a16 100644 --- a/ruby/lib/jam_ruby/models/affiliate_partner.rb +++ b/ruby/lib/jam_ruby/models/affiliate_partner.rb @@ -50,6 +50,10 @@ class JamRuby::AffiliatePartner < ActiveRecord::Base record.entity_type ||= ENTITY_TYPES.first end + def display_name + partner_name || (partner_user ? partner_user.name : 'abandoned') + end + # used by admin def self.create_with_params(params={}) raise 'not supported'