github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-01 01:44:32 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Cleaned up the sso codefix, thanks @SamSaffron

Browse Source 
@SamSaffron showed me a cleaner way to use the if statements in the sso redirect code.

Thanks sam ;)
This commit is contained in:
Sigurður Guðbrandsson 2015-02-23 22:10:44 +00:00
parent 334a357363
commit 96e6fd3449
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/application_controller.rb
View File

@ -391,12 +391,14 @@ class ApplicationController < ActionController::Base
cookies[:destination_url] = request.original_url unless request.original_url =~ /uploads/ cookies[:destination_url] = request.original_url unless request.original_url =~ /uploads/
# redirect user to the SSO page if we need to log in AND SSO is enabled # redirect user to the SSO page if we need to log in AND SSO is enabled
if (SiteSetting.enable_sso && SiteSetting.login_required) if SiteSetting.login_required?
if SiteSetting.enable_sso?
redirect_to '/session/sso' redirect_to '/session/sso'
elsif SiteSetting.login_required? else
redirect_to :login redirect_to :login
end end
end end
end
def block_if_readonly_mode def block_if_readonly_mode
return if request.fullpath.start_with?("/admin/backups") return if request.fullpath.start_with?("/admin/backups")