diff --git a/web/app/assets/javascripts/web/session_info.js b/web/app/assets/javascripts/web/session_info.js index 7e8ef3dac..d95684437 100644 --- a/web/app/assets/javascripts/web/session_info.js +++ b/web/app/assets/javascripts/web/session_info.js @@ -174,7 +174,10 @@ $('.call-to-action').html('Tell the session organizer if you can no longer join this session'); $btnAction.html('CANCEL RSVP'); $btnAction.click(function(e) { - ui.launchRsvpCancelDialog(musicSessionId, rsvp.id); + ui.launchRsvpCancelDialog(musicSessionId, rsvp.id) + .one(EVENTS.RSVP_CANCELED, function() { + location.reload(); + }); }); } } @@ -184,7 +187,10 @@ $('.call-to-action').html("Tell the session organizer you'd like to play in this session"); $btnAction.html('RSVP NOW!'); $btnAction.click(function(e) { - ui.launchRsvpSubmitDialog(musicSessionId); + ui.launchRsvpSubmitDialog(musicSessionId) + .one(EVENTS.RSVP_SUBMITTED, function() { + location.reload(); + }) }); } }) @@ -201,14 +207,6 @@ }); addLatencyDetails(); - - $(document).on(EVENTS.RSVP_SUBMITTED, function() { - location.reload(); - }); - - $(document).on(EVENTS.RSVP_CANCELED, function() { - location.reload(); - }); } this.initialize = initialize; diff --git a/web/app/views/music_sessions/session_info.html.haml b/web/app/views/music_sessions/session_info.html.haml index 7d82077aa..a4ba55070 100644 --- a/web/app/views/music_sessions/session_info.html.haml +++ b/web/app/views/music_sessions/session_info.html.haml @@ -96,7 +96,10 @@ %br/ .left.w65.ib.still-needed %strong Still Needed - - if @open_slots.blank? + - if @music_session.is_unstructured_rsvp + .clearall.left.w100.h20.ib.mb10 + Open to any instrument + - elsif @open_slots.blank? .clearall.left.w100.h20.ib.mb10 All slots are taken - else @@ -108,8 +111,6 @@ = slot.instrument_id.capitalize = "(#{slot.proficiency_desc})" - - %br{:clear => "all"}/ %br/ .w65.ib.invited %strong Invited diff --git a/web/spec/features/session_info_spec.rb b/web/spec/features/session_info_spec.rb index c0ae5682b..abcd8685c 100644 --- a/web/spec/features/session_info_spec.rb +++ b/web/spec/features/session_info_spec.rb @@ -207,6 +207,10 @@ describe "Session Info", :js => true, :type => :feature, :capybara_feature => tr # musician_access = true, approval_required = false it "should allow anyone to view for 'at will' option after session starts" do + @music_session.musician_access = true + @music_session.approval_required = false + @music_session.save! + # attempt to access with musician who was invited but didn't RSVP fast_signin(@session_invitee, @url) ensure_success({:show_cta => true, :button_text => 'RSVP NOW!'}) @@ -235,6 +239,10 @@ describe "Session Info", :js => true, :type => :feature, :capybara_feature => tr # musician_access = true, approval_required = true it "should allow anyone to view for 'join by approval' option after session starts" do + @music_session.musician_access = true + @music_session.approval_required = true + @music_session.save! + # attempt to access with musician who was invited but didn't RSVP fast_signin(@session_invitee, @url) ensure_success({:show_cta => true, :button_text => 'RSVP NOW!'})