diff --git a/db/up/find_sessions_2020.sql b/db/up/find_sessions_2020.sql index 5ab50ce45..646660cd7 100644 --- a/db/up/find_sessions_2020.sql +++ b/db/up/find_sessions_2020.sql @@ -44,8 +44,8 @@ create sequence arses_id_int_seq; alter table arses add column id_int int not null default nextval('arses_id_int_seq'); ALTER TABLE arses ADD COLUMN ip VARCHAR(200); -ALTER TABLE arses ADD COLUMN username VARCHAR(200) default 'jamjam'; -ALTER TABLE arses ADD COLUMN password VARCHAR(200) default 'blueberryjam'; +ALTER TABLE arses ADD COLUMN username VARCHAR(200) default 'smoketest'; +ALTER TABLE arses ADD COLUMN password VARCHAR(200) default 'foolishcharmer'; ALTER TABLE arses ADD COLUMN port int default 3478; ------ diff --git a/ruby/lib/jam_ruby/models/ars.rb b/ruby/lib/jam_ruby/models/ars.rb index 668e21c2c..cfb054805 100644 --- a/ruby/lib/jam_ruby/models/ars.rb +++ b/ruby/lib/jam_ruby/models/ars.rb @@ -8,4 +8,4 @@ module JamRuby @@log = Logging.logger[Ars] end -end +end \ No newline at end of file diff --git a/ruby/lib/jam_ruby/models/feed.rb b/ruby/lib/jam_ruby/models/feed.rb index f11bb1926..a7b749516 100644 --- a/ruby/lib/jam_ruby/models/feed.rb +++ b/ruby/lib/jam_ruby/models/feed.rb @@ -97,6 +97,7 @@ module JamRuby end query = query.where('feeds.recording_id is NULL OR claimed_recordings.is_public = TRUE') query = query.where('feeds.music_session_id is NULL OR music_sessions_user_history.id IS NOT NULL') + query = query.where('music_sessions.musician_access = TRUE') end current_page = params[:next_page].nil? ? 1 : params[:next_page].to_i