Merge branch 'master' of github.com:zyphlar/Open-Source-Access-Control-Web-Interface
This commit is contained in:
commit
0cd63b085b
|
@ -1,6 +1,12 @@
|
||||||
class ApplicationController < ActionController::Base
|
class ApplicationController < ActionController::Base
|
||||||
protect_from_forgery
|
protect_from_forgery
|
||||||
|
|
||||||
|
force_ssl if: :ssl_configured?
|
||||||
|
|
||||||
|
def ssl_configured?
|
||||||
|
!Rails.env.development? && !Rails.env.test?
|
||||||
|
end
|
||||||
|
|
||||||
rescue_from CanCan::AccessDenied do |exception|
|
rescue_from CanCan::AccessDenied do |exception|
|
||||||
if !current_user.nil? && current_user.orientation.blank? then
|
if !current_user.nil? && current_user.orientation.blank? then
|
||||||
flash[:alert] = "Sorry, you probably need to complete New Member Orientation before having access to this page. <br/>Please check your email and schedule a New Member Orientation with a volunteer."
|
flash[:alert] = "Sorry, you probably need to complete New Member Orientation before having access to this page. <br/>Please check your email and schedule a New Member Orientation with a volunteer."
|
||||||
|
|
Loading…
Reference in New Issue
Block a user