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

join page tweaks

Browse Source
This commit is contained in:
Josh
2018-06-08 16:59:09 -04:00
parent 4f70c9a8e5
commit 2b0f75e62b
2 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/controllers/rooms_controller.rb
View File

@ -74,12 +74,8 @@ class RoomsController < ApplicationController
# GET /r/:room_uid/logout
def logout
# Redirect the owner to their room.
if current_user
redirect_to current_user.main_room
else
redirect_to root_path
end
# Redirect the correct page.
redirect_to @room
end
# POST /r/:room_uid/home
@ -127,12 +123,7 @@ class RoomsController < ApplicationController
# Find the room from the uid.
def find_room
@room = Room.find_by(uid: params[:room_uid])
if @room.nil?
# Handle room doesn't exist.
end
@room = Room.find_by!(uid: params[:room_uid])
end
# Ensure the user is logged into the room they are accessing.