From 6d73d27ed537dbd4bcc13df3fca81e9afcf89ca3 Mon Sep 17 00:00:00 2001 From: Jonathan Kolyer Date: Tue, 15 Oct 2013 09:30:43 -0500 Subject: [PATCH 1/3] vrfs-492: added check for pre-existing MSUH record in self.save --- ruby/lib/jam_ruby/models/music_session_user_history.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ruby/lib/jam_ruby/models/music_session_user_history.rb b/ruby/lib/jam_ruby/models/music_session_user_history.rb index 5b9fcf258..4e7a294b9 100644 --- a/ruby/lib/jam_ruby/models/music_session_user_history.rb +++ b/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 From 360b68afc57cac923cf6d6b4f34ccb7e934200c7 Mon Sep 17 00:00:00 2001 From: Jonathan Kolyer Date: Tue, 15 Oct 2013 09:35:30 -0500 Subject: [PATCH 2/3] vrfs-492: updated stale_client to be fault-tolerant when music_session_id is nil --- websocket-gateway/lib/jam_websockets/router.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/websocket-gateway/lib/jam_websockets/router.rb b/websocket-gateway/lib/jam_websockets/router.rb index 7c2681498..349f12547 100644 --- a/websocket-gateway/lib/jam_websockets/router.rb +++ b/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 From db5804d1cfe4d6ba34311694c09d585dc707f08c Mon Sep 17 00:00:00 2001 From: Jonathan Kolyer Date: Tue, 15 Oct 2013 09:54:16 -0500 Subject: [PATCH 3/3] vrfs-768: changed url param for admin toggle to just admin; added h2 title with instructions for toggling --- admin/Gemfile | 2 +- admin/app/admin/music_session_history.rb | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/admin/Gemfile b/admin/Gemfile index 5e8705cd2..7d49040dd 100644 --- a/admin/Gemfile +++ b/admin/Gemfile @@ -79,7 +79,7 @@ end # gem 'capistrano' # To use debugger -# gem 'debugger' +gem 'debugger' group :development, :test do gem 'capybara' diff --git a/admin/app/admin/music_session_history.rb b/admin/app/admin/music_session_history.rb index 81b56bd03..69b5fe594 100644 --- a/admin/app/admin/music_session_history.rb +++ b/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