Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop

admin/Gemfile

@@ -79,7 +79,7 @@ end
 # gem 'capistrano'
 
 # To use debugger
-# gem 'debugger'
+gem 'debugger'
 
 group :development, :test do
   gem 'capybara'

admin/app/admin/music_session_history.rb

@@ -6,7 +6,7 @@ ActiveAdmin.register JamRuby::MusicSessionHistory, :as => 'Music Session History
 
   controller do
     def scoped_collection
-      if '1' == params['user_admin_eq']
+      if params['admin'].blank? || '1' == params['admin']
         @music_session_histories ||= end_of_association_chain
           .includes([:user, :band])
           .order('created_at DESC')
@@ -23,6 +23,7 @@ ActiveAdmin.register JamRuby::MusicSessionHistory, :as => 'Music Session History
   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)"
       columns do
         column do
           panel 'Session Details' do

ruby/lib/jam_ruby/models/music_session_user_history.rb

@@ -24,7 +24,10 @@ module JamRuby
     end
 
     def self.save(music_session_id, user_id, client_id)
-      session_user_history = MusicSessionUserHistory.new()
+      return true if 0 < self.where(:music_session_id => music_session_id, 
+                                    :user_id => user_id, 
+                                    :client_id => client_id).count
+      session_user_history = MusicSessionUserHistory.new
       session_user_history.music_session_id = music_session_id
       session_user_history.user_id = user_id
       session_user_history.client_id = client_id

websocket-gateway/lib/jam_websockets/router.rb

@@ -322,8 +322,9 @@ module JamWebsockets
           music_session_id = connection_manager.flag_connection_stale_with_client_id(cid)
           # update the session members, letting them know this client went stale
           context = @client_lookup[client.client_id]
-          music_session = MusicSession.find_by_id(music_session_id) unless music_session_id.nil?
-          Notification.send_musician_session_stale(music_session, client.client_id, context.user) unless music_session.nil?
+          if music_session = MusicSession.find_by_id(music_session_id) 
+            Notification.send_musician_session_stale(music_session, client.client_id, context.user)
+          end unless music_session_id.nil?
         end
       end
     end