From 4e674b312c4d09a85caf8834518166e5a604ea9f Mon Sep 17 00:00:00 2001
From: Seth Call <seth@jamkazam.com>
Date: Tue, 18 Feb 2014 22:35:23 +0000
Subject: [PATCH] * VRFS-1171 - resolved by moving notification out of
 transaction

---
 ruby/lib/jam_ruby/connection_manager.rb       |  6 +-----
 .../assets/javascripts/createSession.js.erb   |  5 +++--
 web/lib/music_session_manager.rb              | 19 +++++++++++--------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/ruby/lib/jam_ruby/connection_manager.rb b/ruby/lib/jam_ruby/connection_manager.rb
index d747d7d9e..bf9fb7614 100644
--- a/ruby/lib/jam_ruby/connection_manager.rb
+++ b/ruby/lib/jam_ruby/connection_manager.rb
@@ -308,14 +308,10 @@ SQL
 
         if connection.errors.any?
           raise ActiveRecord::Rollback
-        else
-          blk.call(db_conn, connection) unless blk.nil?
-          user.update_progression_field(:first_music_session_at)
-          MusicSessionUserHistory.save(music_session_id, user_id, client_id, tracks)
         end
       end
 
-      return connection
+      connection
     end
 
     # if a blk is passed in, upon success, it will be called and you can issue notifications
diff --git a/web/app/assets/javascripts/createSession.js.erb b/web/app/assets/javascripts/createSession.js.erb
index 7fb632541..581a7b42c 100644
--- a/web/app/assets/javascripts/createSession.js.erb
+++ b/web/app/assets/javascripts/createSession.js.erb
@@ -39,7 +39,7 @@
             $('#band-list', $form).val(bandId);
 
             var musician_access = sessionSettings.hasOwnProperty('musician_access') ? sessionSettings.musician_access : true;
-            $('#musician-access option[value=' + musician_access + ']').attr('selected', 'selected');
+            $('#musician-access').val(musician_access.toString());
 
             toggleMusicianAccess();
 
@@ -49,7 +49,8 @@
             }
 
             var fan_access = sessionSettings.hasOwnProperty('fan_access') ? sessionSettings.fan_access : true;
-            $('#fan-access option[value=' + fan_access + ']').attr('selected', 'selected');
+          console.log("FAN ACCESS: MUSICIAN_ACCESS", fan_access.toString(), musician_access.toString(), sessionSettings)
+            $('#fan-access').val(fan_access.toString());
             toggleFanAccess();
 
             if (fan_access) {
diff --git a/web/lib/music_session_manager.rb b/web/lib/music_session_manager.rb
index fd96cd593..328ddedbc 100644
--- a/web/lib/music_session_manager.rb
+++ b/web/lib/music_session_manager.rb
@@ -106,16 +106,19 @@ MusicSessionManager < BaseManager
 
       music_session = MusicSession.find(music_session_id)
 
-      connection = ConnectionManager.new.join_music_session(user, client_id, music_session, as_musician, tracks)  do |db_conn, connection|
-        if as_musician && music_session.musician_access
+      connection = ConnectionManager.new.join_music_session(user, client_id, music_session, as_musician, tracks)
 
-          # send to session participants
-          Notification.send_session_join(music_session, connection, user)
+      user.update_progression_field(:first_music_session_at)
+      MusicSessionUserHistory.save(music_session_id, user.id, client_id, tracks)
 
-          # send "musician joined session" notification only if it's not a band session since there will be a "band joined session" notification
-          if music_session.band.nil?
-            Notification.send_musician_session_join(music_session, connection, user)
-          end
+      if as_musician && music_session.musician_access
+
+        # send to session participants
+        Notification.send_session_join(music_session, connection, user)
+
+        # send "musician joined session" notification only if it's not a band session since there will be a "band joined session" notification
+        if music_session.band.nil?
+          Notification.send_musician_session_join(music_session, connection, user)
         end
       end