From ef87d635e262a229b92c52cf1444b61b16381216 Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Mon, 28 Jul 2014 10:05:16 -0500
Subject: [PATCH] * fixing some admin pathing/url issues

---
 admin/app/admin/score_export.rb            | 4 ++--
 admin/app/admin/score_history.rb           | 8 +++++++-
 admin/app/assets/javascripts/admin_rest.js | 2 +-
 admin/app/assets/javascripts/mix_again.js  | 2 +-
 admin/config/initializers/gon.rb           | 2 +-
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/admin/app/admin/score_export.rb b/admin/app/admin/score_export.rb
index 85d1aac0c..ddfcfaec5 100644
--- a/admin/app/admin/score_export.rb
+++ b/admin/app/admin/score_export.rb
@@ -65,7 +65,7 @@ ActiveAdmin.register_page "Download CSV" do
       end
       column do
         panel "Usage" do
-          span "Select a start day, and end day to generate a CSV with a score summary."
+          span "Select a start day and end day to generate a CSV with a score summary. Both fields are optional."
         end
         panel "Limitation 1" do
           div do
@@ -75,7 +75,7 @@ ActiveAdmin.register_page "Download CSV" do
         panel "Limitation 2" do
           div do
             span do "This report uses the score_histories table, which can lag up to 1 hour behind data.  You can force a score_history sweep by going to" end
-            span do link_to "Resque", "#{Gon.global.prefix}resque/schedule" end
+            span do link_to "Resque", "#{Gon.global.prefix}/resque/schedule" end
             span do " and then clicking 'Queue Now' for ScoreHistorySweeper.  When the job count goes from 1 to 0, the score_histories table is now completely up-to-date, and you can make a 'fresh' CSV." end
           end
         end
diff --git a/admin/app/admin/score_history.rb b/admin/app/admin/score_history.rb
index 3fb0c5d17..02306ec43 100644
--- a/admin/app/admin/score_history.rb
+++ b/admin/app/admin/score_history.rb
@@ -4,10 +4,16 @@ ActiveAdmin.register JamRuby::ScoreHistory, :as => 'Score History' do
   config.batch_actions = false
   config.clear_action_items!
   config.filters = true
-  config.per_page = 10
+  config.per_page = 100
 
   filter :score
   filter :score_dt
+  #filter :from_user_id_eq, :as => :autocomplete, :url => "#{Gon.global.prefix}/admin/users/autocomplete_user_email",
+  #       :label => "From User", :required => false,
+  #       :wrapper_html => { :style => "list-style: none" }
+
+  #autocomplete :user, :email, :full => true, :display_value => :autocomplete_display_name
+
   filter :from_user_id, as: :string
   filter :from_latency_tester_id
   filter :from_isp
diff --git a/admin/app/assets/javascripts/admin_rest.js b/admin/app/assets/javascripts/admin_rest.js
index e41ea253a..64f49efdf 100644
--- a/admin/app/assets/javascripts/admin_rest.js
+++ b/admin/app/assets/javascripts/admin_rest.js
@@ -17,7 +17,7 @@
             return $.ajax({
                 type: "POST",
                 dataType: "json",
-                url: gon.global.prefix + 'api/mix/' + mixId + '/enqueue',
+                url: gon.global.prefix + '/api/mix/' + mixId + '/enqueue',
                 contentType: 'application/json',
                 processData: false
             });
diff --git a/admin/app/assets/javascripts/mix_again.js b/admin/app/assets/javascripts/mix_again.js
index 5086e7a14..0272941f9 100644
--- a/admin/app/assets/javascripts/mix_again.js
+++ b/admin/app/assets/javascripts/mix_again.js
@@ -9,7 +9,7 @@
             var $link = $(this);
             restAdmin.tryMixAgain({mix_id: $link.attr('data-mix-id')})
                 .done(function(response) {
-                    $link.closest('div.mix-again').find('div.mix-again-dialog').html('<div>Mix enqueued</div><a href="' + gon.global.prefix + 'resque">Resque Web</a>').dialog();
+                    $link.closest('div.mix-again').find('div.mix-again-dialog').html('<div>Mix enqueued</div><a href="' + gon.global.prefix + '/resque">Resque Web</a>').dialog();
                 })
                 .error(function(jqXHR) {
                     $link.closest('div.mix-again').find('div.mix-again-dialog').html('Mix failed: ' + jqXHR.responseText).dialog();
diff --git a/admin/config/initializers/gon.rb b/admin/config/initializers/gon.rb
index 9eb7ab9da..d8e7bd43f 100644
--- a/admin/config/initializers/gon.rb
+++ b/admin/config/initializers/gon.rb
@@ -1 +1 @@
-Gon.global.prefix = ENV['RAILS_RELATIVE_URL_ROOT'] || '/'
\ No newline at end of file
+Gon.global.prefix = ENV['RAILS_RELATIVE_URL_ROOT'] || ''
\ No newline at end of file