IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

UX: improve message when admin login is blocked because of admin ip address whitelisting

Browse Source
This commit is contained in:
Neil Lalonde
2015-03-02 12:13:10 -05:00
parent 1bf4f34049
commit 7c14db44cc
8 changed files with 36 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/auth/result.rb
View File

@@ -2,7 +2,8 @@ class Auth::Result
attr_accessor :user, :name, :username, :email, :user,
:email_valid, :extra_data, :awaiting_activation,
:awaiting_approval, :authenticated, :authenticator_name,
:requires_invite, :not_allowed_from_ip_address
:requires_invite, :not_allowed_from_ip_address,
:admin_not_allowed_from_ip_address
def session_data
{
@@ -30,7 +31,8 @@ class Auth::Result
authenticated: !!authenticated,
awaiting_activation: !!awaiting_activation,
awaiting_approval: !!awaiting_approval,
not_allowed_from_ip_address: !!not_allowed_from_ip_address
not_allowed_from_ip_address: !!not_allowed_from_ip_address,
admin_not_allowed_from_ip_address: !!admin_not_allowed_from_ip_address
}
end
else