stop redirecting and return forbidden status
This commit is contained in:
parent
a737bd3cfd
commit
3348ea7b54
1 changed files with 4 additions and 11 deletions
|
@ -22,14 +22,7 @@ class ApplicationController < ActionController::Base
|
||||||
helper_method :admin?
|
helper_method :admin?
|
||||||
|
|
||||||
def handle_unauthorized
|
def handle_unauthorized
|
||||||
if authenticated? && (params[:controller] == 'maps') && (params[:action] == 'show')
|
head :forbidden
|
||||||
redirect_to request_access_map_path(params[:id])
|
|
||||||
elsif authenticated?
|
|
||||||
redirect_to root_path, notice: "You don't have permission to see that page."
|
|
||||||
else
|
|
||||||
store_location_for(resource, request.fullpath)
|
|
||||||
redirect_to sign_in_path, notice: 'Try signing in to do that.'
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
@ -40,19 +33,19 @@ class ApplicationController < ActionController::Base
|
||||||
|
|
||||||
def require_no_user
|
def require_no_user
|
||||||
return true unless authenticated?
|
return true unless authenticated?
|
||||||
redirect_to edit_user_path(user), notice: 'You must be logged out.'
|
head :forbidden
|
||||||
false
|
false
|
||||||
end
|
end
|
||||||
|
|
||||||
def require_user
|
def require_user
|
||||||
return true if authenticated?
|
return true if authenticated?
|
||||||
redirect_to sign_in_path, notice: 'You must be logged in.'
|
head :forbidden
|
||||||
false
|
false
|
||||||
end
|
end
|
||||||
|
|
||||||
def require_admin
|
def require_admin
|
||||||
return true if authenticated? && admin?
|
return true if authenticated? && admin?
|
||||||
redirect_to root_url, notice: 'You need to be an admin for that.'
|
head :forbidden
|
||||||
false
|
false
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue