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' of bitbucket.org:jamkazam/jam-cloud into develop

This commit is contained in:
Seth Call 2015-01-07 08:55:16 -06:00
parent 585f307747 67b1132d24
commit b4fed74b50
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -380,16 +380,14 @@ module JamRuby
ms.invitations << invitation
# if the session start time is not within the next 1 minute (user could create a "scheduled session"
# for 8:30 at 8:29. In this case send the regular scheduled session notification since it's still "future")
# send SCHEDULED SESSION INVITATION
if ms.scheduled_start && (ms.scheduled_start - Time.now.utc) / 60 > 1
# send scheduled session notification or join session notification
case ms.create_type
when CREATE_TYPE_RSVP, CREATE_TYPE_SCHEDULE_FUTURE
Notification.send_scheduled_session_invitation(ms, receiver)
# otherwise send the notification that allows the user to join the session directly
else
Notification.send_session_invitation(receiver, user, ms.id)
end
end if options[:invitations]
options[:music_notations].each do |notation|