From 7dcce46dc1ec8080cedba4d06a7172c490aaaa7f Mon Sep 17 00:00:00 2001 From: Seth Call Date: Wed, 6 May 2020 22:12:16 -0500 Subject: [PATCH] let in friends --- ruby/lib/jam_ruby/models/connection.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ruby/lib/jam_ruby/models/connection.rb b/ruby/lib/jam_ruby/models/connection.rb index 81bbfbc8d..d8136a486 100644 --- a/ruby/lib/jam_ruby/models/connection.rb +++ b/ruby/lib/jam_ruby/models/connection.rb @@ -119,7 +119,8 @@ module JamRuby if !(music_session.music_session.creator.id == user.id || music_session.creator.id == user.id || music_session.invited_musicians.exists?(user.id) || - music_session.is_lesson_member?(user)) + music_session.is_lesson_member?(user) || + (music_session.friends_can_join && user.friends?(music_session.creator))) errors.add(:approval_required, ValidationMessages::INVITE_REQUIRED) return false end @@ -129,8 +130,8 @@ module JamRuby if !(music_session.music_session.creator.id == user.id || music_session.creator.id == user.id || music_session.invited_musicians.exists?(user.id) || - music_session.is_lesson_member?(user)) - + music_session.is_lesson_member?(user) || + (music_session.friends_can_join && user.friends?(music_session.creator))) errors.add(:musician_access, ValidationMessages::INVITE_REQUIRED) return false end