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

Merge branch 'develop' into feature/ars

This commit is contained in:
Seth Call 2020-05-06 22:12:47 -05:00
parent a81c659851 7dcce46dc1
commit 51a16da559
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ruby/lib/jam_ruby/models/connection.rb
View File

@ -119,7 +119,8 @@ module JamRuby
if !(music_session.music_session.creator.id == user.id || if !(music_session.music_session.creator.id == user.id ||
music_session.creator.id == user.id || music_session.creator.id == user.id ||
music_session.invited_musicians.exists?(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) errors.add(:approval_required, ValidationMessages::INVITE_REQUIRED)
return false return false
end end
@ -129,8 +130,8 @@ module JamRuby
if !(music_session.music_session.creator.id == user.id || if !(music_session.music_session.creator.id == user.id ||
music_session.creator.id == user.id || music_session.creator.id == user.id ||
music_session.invited_musicians.exists?(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) errors.add(:musician_access, ValidationMessages::INVITE_REQUIRED)
return false return false
end end