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

GRN-11: Ability to configure room specific settings (#348)

Browse Source 
* Added the ability to set room settings on create or update

* Added room settings alerts and made fixes to other alerts

* Small bug fixes related to rubocop and the create room modal

* Update test case and fixed issue with small edge case

* Update room.js
This commit is contained in:
farhatahmad
2019-02-06 11:08:19 -05:00
committed by Jesus Federico
parent 992c154c10
commit 2e8670a8ab
21 changed files with 284 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/sessions_controller.rb
View File

@ -29,11 +29,11 @@ class SessionsController < ApplicationController
def create
user = User.find_by(email: session_params[:email])
if user && !user.greenlight_account?
redirect_to root_path, notice: I18n.t("invalid_login_method")
redirect_to root_path, alert: I18n.t("invalid_login_method")
elsif user.try(:authenticate, session_params[:password])
login(user)
else
redirect_to root_path, notice: I18n.t("invalid_credentials")
redirect_to root_path, alert: I18n.t("invalid_credentials")
end
end
@ -48,7 +48,7 @@ class SessionsController < ApplicationController
# POST /auth/failure
def omniauth_fail
redirect_to root_path, notice: I18n.t(params[:message], default: I18n.t("omniauth_error"))
redirect_to root_path, alert: I18n.t(params[:message], default: I18n.t("omniauth_error"))
end
private