forked from External/greenlight
username validations
This commit is contained in:
@ -22,15 +22,13 @@ class LandingController < ApplicationController
|
||||
render_meeting
|
||||
end
|
||||
|
||||
def room
|
||||
render_room
|
||||
end
|
||||
|
||||
def admin?
|
||||
@user == current_user
|
||||
end
|
||||
helper_method :admin?
|
||||
|
||||
private
|
||||
|
||||
def render_meeting
|
||||
@resource = params[:resource]
|
||||
@meeting_token = params[:id] || @meeting_token = helpers.new_meeting_token
|
||||
@ -47,5 +45,5 @@ class LandingController < ApplicationController
|
||||
end
|
||||
render :action => 'room'
|
||||
end
|
||||
|
||||
|
||||
end
|
||||
|
@ -3,7 +3,7 @@ class SessionsController < ApplicationController
|
||||
@user = User.from_omniauth(request.env['omniauth.auth'])
|
||||
if @user.persisted?
|
||||
session[:user_id] = @user.id
|
||||
redirect_to controller: 'landing', action: 'room', id: @user.username
|
||||
redirect_to controller: 'landing', action: 'index', id: @user.username, resource: 'rooms'
|
||||
else
|
||||
@user.save!
|
||||
session[:user_id] = @user.id
|
||||
|
@ -9,8 +9,9 @@ class UsersController < ApplicationController
|
||||
# PATCH/PUT /users/1.json
|
||||
def update
|
||||
if @user.update(user_params)
|
||||
redirect_to controller: 'landing', action: 'room', name: @user.username
|
||||
redirect_to controller: 'landing', action: 'index', id: @user.username, resource: 'rooms'
|
||||
else
|
||||
@error = @user.errors.first[1] rescue nil
|
||||
render :edit
|
||||
end
|
||||
end
|
||||
|
Reference in New Issue
Block a user