forked from External/greenlight
validate passwords and fix home
This commit is contained in:
@ -42,6 +42,12 @@ class ApplicationController < ActionController::Base
|
||||
@room.meeting.join_path(current_user.name, opts)
|
||||
end
|
||||
helper_method :owner_meeting_url
|
||||
|
||||
# Determines if a form field needs the is-invalid class.
|
||||
def form_is_invalid?(obj, key)
|
||||
'is-invalid' if !obj.errors.messages[key].empty?
|
||||
end
|
||||
helper_method :form_is_invalid?
|
||||
|
||||
# Default, unconfigured meeting options.
|
||||
def default_meeting_options
|
||||
|
@ -1,9 +1,7 @@
|
||||
class RoomsController < ApplicationController
|
||||
|
||||
before_action :find_room, except: :create
|
||||
|
||||
#before_action :verify_room_ownership
|
||||
#skip_before_action :verify_room_ownership, only: [:create, :show, :join, :wait]
|
||||
before_action :verify_room_ownership, only: [:start, :destroy, :home]
|
||||
|
||||
# POST /r
|
||||
def create
|
||||
|
@ -5,14 +5,14 @@ class UsersController < ApplicationController
|
||||
|
||||
# POST /users
|
||||
def create
|
||||
user = User.new(user_params)
|
||||
user.provider = "greenlight"
|
||||
@user = User.new(user_params)
|
||||
@user.provider = "greenlight"
|
||||
|
||||
if user.save
|
||||
login(user)
|
||||
if @user.save
|
||||
login(@user)
|
||||
else
|
||||
# Handle error on user creation.
|
||||
|
||||
render :new
|
||||
end
|
||||
end
|
||||
|
||||
|
Reference in New Issue
Block a user