diff --git a/ruby/lib/jam_ruby/models/music_session.rb b/ruby/lib/jam_ruby/models/music_session.rb index 095a8035a..e1cbea90e 100644 --- a/ruby/lib/jam_ruby/models/music_session.rb +++ b/ruby/lib/jam_ruby/models/music_session.rb @@ -304,6 +304,7 @@ module JamRuby filter_approved = only_approved ? 'AND rrrs.chosen = true' : '' MusicSession.where(%Q{music_sessions.canceled = FALSE AND + music_sessions.create_type != '#{CREATE_TYPE_QUICK_START}' AND (music_sessions.scheduled_start is NULL OR music_sessions.scheduled_start > NOW() - '4 hour'::INTERVAL) AND music_sessions.id in ( select distinct(rs.music_session_id) diff --git a/web/app/assets/javascripts/accounts.js b/web/app/assets/javascripts/accounts.js index c5135f8d4..64501695d 100644 --- a/web/app/assets/javascripts/accounts.js +++ b/web/app/assets/javascripts/accounts.js @@ -53,6 +53,12 @@ } , { variable: 'data' })); $('#account-content-scroller').html($template); + + if(userDetail.upcoming_session_count > 0) { + $('#account-scheduled-sessions-link').show(); + } else { + $('#account-scheduled-sessions-link').hide(); + } } function prettyPrintAudioProfiles(profileMap) {