lino.jorzick/greenlight
1
0
Fork 0
forked from External/greenlight
Code Issues Pull Requests Projects Releases Wiki Activity

work on user settings

Browse Source
This commit is contained in:
Josh
2018-06-04 15:58:59 -04:00
parent 79949b4aa6
commit d9a95ffc18
22 changed files with 266 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/controllers/rooms_controller.rb
View File

@ -57,9 +57,16 @@ class RoomsController < ApplicationController
def join
opts = default_meeting_options
# If you're unauthenticated, you must enter a name to join the meeting.
if params[@room.invite_path][:join_name]
redirect_to @room.join_path(params[@room.invite_path][:join_name], opts)
if @room.is_running?
# If you're unauthenticated, you must enter a name to join the meeting.
if params[@room.invite_path][:join_name]
redirect_to @room.join_path(params[@room.invite_path][:join_name], opts)
else
redirect_to @room.join_path(current_user, opts)
end
else
# They need to wait until the meeting begins.
end
end