From 4872c037adf790be2b1fabfb2d3776c564bb961a Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Sat, 5 Jul 2014 21:51:45 -0400 Subject: [PATCH] added field to approved_rsvps method per request from Bert --- ruby/lib/jam_ruby/models/music_session.rb | 4 +--- web/app/assets/javascripts/scheduled_session.js | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/ruby/lib/jam_ruby/models/music_session.rb b/ruby/lib/jam_ruby/models/music_session.rb index 2a4097cc9..0449bf137 100644 --- a/ruby/lib/jam_ruby/models/music_session.rb +++ b/ruby/lib/jam_ruby/models/music_session.rb @@ -475,11 +475,9 @@ module JamRuby return "#{musician_access_description}. #{fan_access_description}." end - # next 3 methods are used for the right sidebar on the session info page - # retrieve users that have approved RSVPs def approved_rsvps - users = User.find_by_sql(%Q{select u.id, u.photo_url, u.first_name, u.last_name, rs.instrument_id, ii.description, rs.proficiency_level, rr.id as rsvp_request_id + users = User.find_by_sql(%Q{select u.id, u.photo_url, u.first_name, u.last_name, rs.instrument_id, ii.description, rs.proficiency_level, rr.id as rsvp_request_id, rrrs.id as rsvp_request_rsvp_slot_id from rsvp_slots rs inner join rsvp_requests_rsvp_slots rrrs on rrrs.rsvp_slot_id = rs.id inner join rsvp_requests rr on rrrs.rsvp_request_id = rr.id diff --git a/web/app/assets/javascripts/scheduled_session.js b/web/app/assets/javascripts/scheduled_session.js index f1a56f475..fee6de44c 100644 --- a/web/app/assets/javascripts/scheduled_session.js +++ b/web/app/assets/javascripts/scheduled_session.js @@ -389,7 +389,6 @@ createSessionSettings.recurring_mode.label = $recurringModeList.get(0).options[$recurringModeList.get(0).selectedIndex].text; createSessionSettings.recurring_mode.value = $recurringModeList.val(); createSessionSettings.open_rsvps = $('#session-plus-musicians')[0].checked; - console.log("createSessionSettings.open_rsvps=%o", createSessionSettings.open_rsvps); } return true; @@ -479,7 +478,6 @@ createSessionSettings.language.label = $languageList.get(0).options[$languageList.get(0).selectedIndex].text; createSessionSettings.open_rsvps = $('#session-plus-musicians')[0].checked; - console.log("createSessionSettings.open_rsvps=%o", createSessionSettings.open_rsvps); return true; }