* fix broken pages in admin

admin/Gemfile

@@ -104,8 +104,11 @@ group :development, :test do
   gem 'capybara'
   gem 'rspec-rails'
   gem 'guard-rspec', '0.5.5'
-  gem 'jasmine', '1.3.1' 
+  gem 'jasmine', '1.3.1'
   gem 'pry'
+  gem 'pry-remote'
+  gem 'pry-stack_explorer'
+  gem 'pry-debugger'
   gem 'execjs', '1.4.0'
   gem 'therubyracer' #, '0.11.0beta8'
   gem 'factory_girl_rails', '4.1.0'
@@ -117,9 +120,4 @@ end
 group :test do
   gem 'simplecov', '~> 0.7.1'
   gem 'simplecov-rcov'
-end
-
-gem 'pry'
-gem 'pry-remote'
-gem 'pry-stack_explorer'
-gem 'pry-debugger'
+end

admin/app/admin/mix.rb

@@ -24,7 +24,7 @@ ActiveAdmin.register JamRuby::Mix, :as => 'Mixes' 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 :s3_url do |mix| mix.sign_url end
               row :manifest do |mix| mix.manifest end
               row :completed do |mix| "#{mix.completed ? "finished" : "not finished"}" end
               if mix.completed

admin/app/admin/music_session_history.rb

@@ -1,4 +1,4 @@
-ActiveAdmin.register JamRuby::MusicSession, :as => 'Music Session History' do
+ActiveAdmin.register JamRuby::MusicSession, :as => 'Music Session' do
 
   config.filters = false
   config.per_page = 50
@@ -9,14 +9,14 @@ ActiveAdmin.register JamRuby::MusicSession, :as => 'Music Session History' do
   controller do
     def scoped_collection
       if params['admin'].blank? || '1' == params['admin']
-        @music_session_histories ||= end_of_association_chain
-          .includes([:user, :band])
+        @music_sessions ||= end_of_association_chain
+          .includes([:creator, :band])
           .order('created_at DESC')
       else
-        @music_session_histories ||= end_of_association_chain
+        @music_sessions ||= end_of_association_chain
           .joins('INNER JOIN users AS uu ON uu.id = music_sessions.user_id')
           .where(['uu.admin = ?','f'])
-          .includes([:user, :band])
+          .includes([:creator, :band])
           .order('created_at DESC')
       end
     end
@@ -33,9 +33,9 @@ ActiveAdmin.register JamRuby::MusicSession, :as => 'Music Session History' 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 :creator do |msh| auto_link(msh.creator, msh.creator.try(:email)) end
               row :band do |msh| auto_link(msh.band, msh.band.try(:name)) end
-              row :genres
+              row :genre
             end 
           end
         end