Skip to content

Fixed the part where the operation does not succeed in Redmine 3.4.6. #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed the part where the operation does not succeed in Redmine 3.4.6. #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/controllers/redmine_oauth_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def checked_try_to_login(email, user)
if allowed_domain_for?(email)
try_to_login email, user
else
flash['error'] = l(:notice_domain_not_allowed, :domain => parse_email(email)['domain'])
flash['error'] = l(:notice_domain_not_allowed, :domain => parse_email(email)[:domain])
redirect_to signin_path
end
end
Expand Down Expand Up @@ -82,7 +82,7 @@ def try_to_login email, info
if user.active?
successful_authentication(user)
else
account_pending
account_pending(user)
end
end
end
Expand Down
2 changes: 1 addition & 1 deletion lib/helpers/checker.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ def allowed_domain_for? email
return unless allowed_domains
allowed_domains = allowed_domains.split
return true if allowed_domains.empty?
allowed_domains.index(parse_email(email)['domain'])
allowed_domains.index(parse_email(email)[:domain])
end
end
end