seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

added field to approved_rsvps method per request from Bert

This commit is contained in:
Brian Smith 2014-07-05 21:51:45 -04:00
parent 1975233e57
commit 4872c037ad
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruby/lib/jam_ruby/models/music_session.rb
View File

@ -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

2
web/app/assets/javascripts/scheduled_session.js
View File

@ -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;
}