seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

* fixing some admin pathing/url issues

This commit is contained in:
Seth Call 2014-07-28 10:05:16 -05:00
parent 50c611d729
commit ef87d635e2
5 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/app/admin/score_export.rb
View File

@ -65,7 +65,7 @@ ActiveAdmin.register_page "Download CSV" do
end end
column do column do
panel "Usage" 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 end
panel "Limitation 1" do panel "Limitation 1" do
div do div do
@ -75,7 +75,7 @@ ActiveAdmin.register_page "Download CSV" do
panel "Limitation 2" do panel "Limitation 2" do
div 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 "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 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
end end

8
admin/app/admin/score_history.rb
View File

@ -4,10 +4,16 @@ ActiveAdmin.register JamRuby::ScoreHistory, :as => 'Score History' do
config.batch_actions = false config.batch_actions = false
config.clear_action_items! config.clear_action_items!
config.filters = true config.filters = true
config.per_page = 10 config.per_page = 100
filter :score filter :score
filter :score_dt 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_user_id, as: :string
filter :from_latency_tester_id filter :from_latency_tester_id
filter :from_isp filter :from_isp

2
admin/app/assets/javascripts/admin_rest.js
View File

@ -17,7 +17,7 @@
return $.ajax({ return $.ajax({
type: "POST", type: "POST",
dataType: "json", dataType: "json",
url: gon.global.prefix + 'api/mix/' + mixId + '/enqueue', url: gon.global.prefix + '/api/mix/' + mixId + '/enqueue',
contentType: 'application/json', contentType: 'application/json',
processData: false processData: false
}); });

2
admin/app/assets/javascripts/mix_again.js
View File

@ -9,7 +9,7 @@
var $link = $(this); var $link = $(this);
restAdmin.tryMixAgain({mix_id: $link.attr('data-mix-id')}) restAdmin.tryMixAgain({mix_id: $link.attr('data-mix-id')})
.done(function(response) { .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) { .error(function(jqXHR) {
$link.closest('div.mix-again').find('div.mix-again-dialog').html('Mix failed: ' + jqXHR.responseText).dialog(); $link.closest('div.mix-again').find('div.mix-again-dialog').html('Mix failed: ' + jqXHR.responseText).dialog();

2
admin/config/initializers/gon.rb
View File

@ -1 +1 @@
Gon.global.prefix = ENV['RAILS_RELATIVE_URL_ROOT'] || '/' Gon.global.prefix = ENV['RAILS_RELATIVE_URL_ROOT'] || ''