From 34b96db2c1a019e585faa3f2fa9ac94235877042 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Mon, 13 Jan 2014 11:24:16 +0000 Subject: [PATCH] * updating nav of jam-admin and adding mixes page --- admin/app/admin/crash_dumps.rb | 1 + admin/app/admin/isp_scoring_data.rb | 2 + admin/app/admin/jam_ruby_invited_users.rb | 2 +- admin/app/admin/jam_ruby_users.rb | 2 +- admin/app/admin/mix.rb | 67 +++++++---------------- admin/app/admin/music_session_history.rb | 4 +- admin/app/admin/promo_buzz.rb | 2 +- admin/app/admin/promo_latest.rb | 2 +- admin/app/admin/user_progression.rb | 2 +- admin/lib/tasks/custom_routes.rake | 15 +++-- 10 files changed, 42 insertions(+), 57 deletions(-) diff --git a/admin/app/admin/crash_dumps.rb b/admin/app/admin/crash_dumps.rb index e21edcfb3..97170df90 100644 --- a/admin/app/admin/crash_dumps.rb +++ b/admin/app/admin/crash_dumps.rb @@ -3,6 +3,7 @@ ActiveAdmin.register JamRuby::CrashDump, :as => 'Crash Dump' do filter :timestamp filter :user_email, :as => :string filter :client_id + menu :parent => 'Debug' index do column "Timestamp" do |post| diff --git a/admin/app/admin/isp_scoring_data.rb b/admin/app/admin/isp_scoring_data.rb index da2201eb4..02756ffc0 100644 --- a/admin/app/admin/isp_scoring_data.rb +++ b/admin/app/admin/isp_scoring_data.rb @@ -2,4 +2,6 @@ ActiveAdmin.register JamRuby::IspScoreBatch, :as => 'Isp Score Data' do config.sort_order = 'created_at_desc' + menu :parent => 'Debug' + end diff --git a/admin/app/admin/jam_ruby_invited_users.rb b/admin/app/admin/jam_ruby_invited_users.rb index 928bef738..e89660e1c 100644 --- a/admin/app/admin/jam_ruby_invited_users.rb +++ b/admin/app/admin/jam_ruby_invited_users.rb @@ -1,5 +1,5 @@ ActiveAdmin.register JamRuby::InvitedUser, :as => 'Invited Users' do - menu :label => 'Invite Users' + menu :label => 'Invite', :parent => 'Users' config.sort_order = 'created_at' diff --git a/admin/app/admin/jam_ruby_users.rb b/admin/app/admin/jam_ruby_users.rb index d6c8587ac..6332400ed 100644 --- a/admin/app/admin/jam_ruby_users.rb +++ b/admin/app/admin/jam_ruby_users.rb @@ -1,6 +1,6 @@ ActiveAdmin.register JamRuby::User, :as => 'Users' do - menu :label => 'Jam User' + menu :label => 'Users', :parent => 'Users' config.sort_order = 'created_at DESC' diff --git a/admin/app/admin/mix.rb b/admin/app/admin/mix.rb index 69b5fe594..7c56bec29 100644 --- a/admin/app/admin/mix.rb +++ b/admin/app/admin/mix.rb @@ -1,55 +1,31 @@ -ActiveAdmin.register JamRuby::MusicSessionHistory, :as => 'Music Session History', :sort_order => 'created_at DESC' do +ActiveAdmin.register JamRuby::Mix, :as => 'Mixes' do - config.filters = false + config.filters = true config.per_page = 50 config.clear_action_items! + config.sort_order = "created_at_desc" + menu :parent => 'Sessions' - controller do - def scoped_collection - if params['admin'].blank? || '1' == params['admin'] - @music_session_histories ||= end_of_association_chain - .includes([:user, :band]) - .order('created_at DESC') - else - @music_session_histories ||= end_of_association_chain - .joins('INNER JOIN users AS uu ON uu.id = music_sessions_history.user_id') - .where(['uu.admin = ?','f']) - .includes([:user, :band]) - .order('created_at DESC') - end - end - end - index :as => :block do |msh| - div :for => msh do - h3 "Session ##{msh.music_session_id}: #{msh.created_at.strftime('%b %d %Y, %H:%M')}" - h4 "(append URL with ?admin=0 to hide admin sessions)" + index :as => :block do |mix| + div :for => mix do + h3 "Mix (Users: #{mix.recording.users.map { |u| u.name }.join ','}) (When: #{mix.created_at.strftime('%b %d %Y, %H:%M')})" columns do column do - panel 'Session Details' do - attributes_table_for(msh) do - row :description - row :duration do |msh| "#{msh.duration_minutes} minutes" end - row :active do |msh| msh.session_removed_at.nil? end - row :creator do |msh| auto_link(msh.user, msh.user.try(:email)) end - row :band do |msh| auto_link(msh.band, msh.band.try(:name)) end - row :genres - end - end - end - column do - panel 'User Details' do - table_for(msuh = msh.music_session_user_histories) do - column :user do |msuh| msuh.user_email end - column :joined do |msuh| msuh.created_at.strftime('%b %d %Y, %H:%M') end - column :duration do |msuh| "#{msuh.duration_minutes} minutes" end - column :active do |msuh| msuh.session_removed_at.nil? end - column :perf_data do |msuh| - unless (uu = msuh.perf_uri).blank? - link_to('Data Link', uu) - else - '' - end + panel 'Mix Details' do + attributes_table_for(mix) do + row :recording do |mix| auto_link(mix.recording, mix.recording.id) end + row :created_at do |mix| mix.created_at.strftime('%b %d %Y, %H:%M') end + row :s3_url do |mix| mix.url end + row :manifest do |mix| mix.manifest end + row :completed do |mix| "#{mix.completed ? "finished" : "not finished"}" end + if mix.completed + row :completed_at do |mix| mix.completed_at.strftime('%b %d %Y, %H:%M') end + elsif mix.error_count > 0 + row :error_count do |mix| "#{mix.error_count} times failed" end + row :error_reason do |mix| "last reason failed: #{mix.error_reason}" end + row :error_detail do |mix| "last error detail: #{mix.error_detail}" end + row :what do |mix| link_to "Your Mom", '/' end end end end @@ -57,5 +33,4 @@ ActiveAdmin.register JamRuby::MusicSessionHistory, :as => 'Music Session History end end end - end diff --git a/admin/app/admin/music_session_history.rb b/admin/app/admin/music_session_history.rb index 69b5fe594..2de49e4b0 100644 --- a/admin/app/admin/music_session_history.rb +++ b/admin/app/admin/music_session_history.rb @@ -1,8 +1,10 @@ -ActiveAdmin.register JamRuby::MusicSessionHistory, :as => 'Music Session History', :sort_order => 'created_at DESC' do +ActiveAdmin.register JamRuby::MusicSessionHistory, :as => 'Music Session History' do config.filters = false config.per_page = 50 config.clear_action_items! + config.sort_order = 'created_at_desc' + menu :parent => 'Sessions', :label => 'Sessions' controller do def scoped_collection diff --git a/admin/app/admin/promo_buzz.rb b/admin/app/admin/promo_buzz.rb index e3d0035b1..f4404e4b8 100644 --- a/admin/app/admin/promo_buzz.rb +++ b/admin/app/admin/promo_buzz.rb @@ -1,6 +1,6 @@ ActiveAdmin.register JamRuby::PromoBuzz, :as => 'Buzz' do - menu :label => 'Home Page Buzz' + menu :label => 'Buzz', :parent => 'Home Page' config.sort_order = 'position ASC aasm_state DESC updated_at DESC' config.batch_actions = false diff --git a/admin/app/admin/promo_latest.rb b/admin/app/admin/promo_latest.rb index 4f759a555..22ae49575 100644 --- a/admin/app/admin/promo_latest.rb +++ b/admin/app/admin/promo_latest.rb @@ -1,6 +1,6 @@ ActiveAdmin.register JamRuby::PromoLatest, :as => 'Latest' do - menu :label => 'Home Page Latest' + menu :label => 'Latest', :parent => 'Home Page' config.batch_actions = false config.sort_order = '' diff --git a/admin/app/admin/user_progression.rb b/admin/app/admin/user_progression.rb index ab8f73c84..cbd54744c 100644 --- a/admin/app/admin/user_progression.rb +++ b/admin/app/admin/user_progression.rb @@ -1,7 +1,7 @@ ActiveAdmin.register JamRuby::User, :as => 'User Progression' do PROGRESSION_DATE = '%Y-%m-%d %H:%M' unless defined?(PROGRESSION_DATE) - menu :label => 'User Progression' + menu :label => 'Progression', :parent => 'Users' config.sort_order = 'updated_at DESC' config.batch_actions = false diff --git a/admin/lib/tasks/custom_routes.rake b/admin/lib/tasks/custom_routes.rake index 2a2bbe587..539f9c66d 100644 --- a/admin/lib/tasks/custom_routes.rake +++ b/admin/lib/tasks/custom_routes.rake @@ -1,7 +1,12 @@ desc 'Print out all defined routes in match order, with names. Target specific controller with CONTROLLER=x.' -task routes: :environment do - all_routes = Rails.application.routes.routes - require 'action_dispatch/routing/inspector' - inspector = ActionDispatch::Routing::RoutesInspector.new(all_routes) - puts inspector.format(ActionDispatch::Routing::ConsoleFormatter.new, ENV['CONTROLLER']) +task custom_routes: :environment do + require 'rails/application/route_inspector' + + inspector = Rails::Application::RouteInspector.new + puts inspector.format(Rails.application.routes.routes) + + #all_routes = Rails.application.routes.routes + + #inspector = ActionDispatch::Routing::RoutesInspector.new(all_routes) + #puts inspector.format(ActionDispatch::Routing::ConsoleFormatter.new, ENV['CONTROLLER']) end \ No newline at end of file