diff --git a/admin/app/admin/affiliate_traffic_totals.rb b/admin/app/admin/affiliate_traffic_totals.rb index 2d1a3b391..f3f24b8ab 100644 --- a/admin/app/admin/affiliate_traffic_totals.rb +++ b/admin/app/admin/affiliate_traffic_totals.rb @@ -23,7 +23,7 @@ ActiveAdmin.register JamRuby::AffiliateTrafficTotal, :as => 'Affiliate Daily Sta # default_actions # use this for all view/edit/delete links column 'Day' do |oo| oo.day end - column 'Partner' do |oo| link_to(oo.affiliate_partner, oo.affiliate_partner.admin_url, {:title => oo.affiliate_partner.display_name}) end + column 'Partner' do |oo| link_to(oo.affiliate_partner.display_name, oo.affiliate_partner.admin_url, {:title => oo.affiliate_partner.display_name}) end column 'Signups' do |oo| oo.signups end column 'Visits' do |oo| oo.visits end diff --git a/admin/app/admin/affiliate_users.rb b/admin/app/admin/affiliate_users.rb index f500a2565..1658d926d 100644 --- a/admin/app/admin/affiliate_users.rb +++ b/admin/app/admin/affiliate_users.rb @@ -2,9 +2,12 @@ ActiveAdmin.register JamRuby::User, :as => 'Referrals' do menu :label => 'Referrals', :parent => 'Affiliates' + config.sort_order = 'created_at DESC' config.batch_actions = false config.clear_action_items! - config.filters = false + config.filters = true + + filter :affiliate_referral index do column 'User' do |oo| link_to(oo.name, oo.admin_url, {:title => oo.name}) end diff --git a/ruby/lib/jam_ruby/models/affiliate_partner.rb b/ruby/lib/jam_ruby/models/affiliate_partner.rb index 42b689db2..5368c67b3 100644 --- a/ruby/lib/jam_ruby/models/affiliate_partner.rb +++ b/ruby/lib/jam_ruby/models/affiliate_partner.rb @@ -55,7 +55,7 @@ class JamRuby::AffiliatePartner < ActiveRecord::Base end def admin_url - APP_CONFIG.admin_root_url + "/admin/affiliates/" + id + APP_CONFIG.admin_root_url + "/admin/affiliates/#{id}" end # used by admin @@ -477,4 +477,8 @@ class JamRuby::AffiliatePartner < ActiveRecord::Base def affiliate_query_params AffiliatePartner::AFFILIATE_PARAMS + self.id.to_s end + + def to_s + display_name + end end diff --git a/web/app/assets/javascripts/react-components/JamTrackLandingScreen.js.jsx.coffee b/web/app/assets/javascripts/react-components/JamTrackLandingScreen.js.jsx.coffee index 63d5425c9..9ff80e996 100644 --- a/web/app/assets/javascripts/react-components/JamTrackLandingScreen.js.jsx.coffee +++ b/web/app/assets/javascripts/react-components/JamTrackLandingScreen.js.jsx.coffee @@ -26,7 +26,7 @@ rest = context.JK.Rest() else howTo = `