gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-13 19:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3619 from hennevogel/refactor/sign-path

Browse source 
Move sign_in_path into the controller it's used...
This commit is contained in:
Henne Vogelsang 2025-08-12 18:07:43 +02:00 • committed by GitHub
commit 3c23b5c8ed
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/controllers/admin/base_controller.rb
View file

@ -16,7 +16,7 @@ module Admin
end end
def verify_user_admin def verify_user_admin
if (current_user.nil?) if current_user.nil?
redirect_to sign_in_path redirect_to sign_in_path
return false return false
end end
@ -26,5 +26,13 @@ module Admin
raise CanCan::AccessDenied.new('You are not authorized to access this page.') raise CanCan::AccessDenied.new('You are not authorized to access this page.')
end end
end end
def sign_in_path
if ENV.fetch('OSEM_ICHAIN_ENABLED', nil) == 'true'
User.ichain_login_url
else
new_user_session_path
end
end
end end
end end

8
app/helpers/application_helper.rb
View file

@ -115,14 +115,6 @@ module ApplicationHelper
conference.event_types.map { |et| et.title.pluralize }.to_sentence conference.event_types.map { |et| et.title.pluralize }.to_sentence
end end
def sign_in_path
if ENV.fetch('OSEM_ICHAIN_ENABLED', nil) == 'true'
new_user_ichain_session_path
else
new_user_session_path
end
end
def rescheduling_hint(affected_event_count) def rescheduling_hint(affected_event_count)
if affected_event_count > 0 if affected_event_count > 0
"You have #{affected_event_count} scheduled #{'event'.pluralize(affected_event_count)}. Changing the conference hours will unschedule those scheduled outside the conference hours." "You have #{affected_event_count} scheduled #{'event'.pluralize(affected_event_count)}. Changing the conference hours will unschedule those scheduled outside the conference hours."