From 051e7f8bdea7d9a0ca446aef0c7e4606cdc637a3 Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Tue, 29 Jul 2014 21:20:38 -0400 Subject: [PATCH 1/4] VRFS-1972 show correct information under Still Needed section for sessions with unstructured RSVPs --- web/app/views/music_sessions/session_info.html.haml | 5 ++++- web/spec/features/session_info_spec.rb | 8 ++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/web/app/views/music_sessions/session_info.html.haml b/web/app/views/music_sessions/session_info.html.haml index 7d82077aa..717648ff8 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 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!'}) From fa7672c0e60eee409f44a80efdc994904a020be3 Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Tue, 29 Jul 2014 21:32:13 -0400 Subject: [PATCH 2/4] fix issue where Session Info page was not being refreshed after submitting or cancelling RSVPs --- web/app/assets/javascripts/web/session_info.js | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/web/app/assets/javascripts/web/session_info.js b/web/app/assets/javascripts/web/session_info.js index 7e8ef3dac..0298bdaed 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.DIALOG_CLOSED, 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; From 9815675bc2f84530117e757f7392ee1796c3903b Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Tue, 29 Jul 2014 21:35:22 -0400 Subject: [PATCH 3/4] reduce space between Still Needed and Invited sections in right sidebar --- web/app/views/music_sessions/session_info.html.haml | 2 -- 1 file changed, 2 deletions(-) diff --git a/web/app/views/music_sessions/session_info.html.haml b/web/app/views/music_sessions/session_info.html.haml index 717648ff8..a4ba55070 100644 --- a/web/app/views/music_sessions/session_info.html.haml +++ b/web/app/views/music_sessions/session_info.html.haml @@ -111,8 +111,6 @@ = slot.instrument_id.capitalize = "(#{slot.proficiency_desc})" - - %br{:clear => "all"}/ %br/ .w65.ib.invited %strong Invited From 12397069d304a0b0320c6acb1fe5f5b24affb81e Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Tue, 29 Jul 2014 21:41:03 -0400 Subject: [PATCH 4/4] handle correct event --- web/app/assets/javascripts/web/session_info.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/app/assets/javascripts/web/session_info.js b/web/app/assets/javascripts/web/session_info.js index 0298bdaed..d95684437 100644 --- a/web/app/assets/javascripts/web/session_info.js +++ b/web/app/assets/javascripts/web/session_info.js @@ -175,7 +175,7 @@ $btnAction.html('CANCEL RSVP'); $btnAction.click(function(e) { ui.launchRsvpCancelDialog(musicSessionId, rsvp.id) - .one(EVENTS.DIALOG_CLOSED, function() { + .one(EVENTS.RSVP_CANCELED, function() { location.reload(); }); });