scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 07:26:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2710 from urbanrotnik/ur-sci-4568-remove-flash-message

Browse source 
Remove flash message for redirects from root url [SCI-4568]
This commit is contained in:
Urban Rotnik 2020-07-08 11:42:05 +02:00 committed by GitHub
parent 33aa1d3641 ceddfdd978
commit d6f37ce28e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/sidebar_toggle.js.erb
View file

@ -63,6 +63,6 @@
})();
if (SideBarToggle.isToggledStorage()) {
SideBarToggle.hide();;
SideBarToggle.hide();
}
})(window);

15
app/controllers/users/sessions_controller.rb
View file

@ -3,8 +3,8 @@
class Users::SessionsController < Devise::SessionsController
layout :session_layout
# before_filter :configure_sign_in_params, only: [:create]
after_action :after_sign_in, only: :create
before_action :remove_authenticate_mesasge_if_root_path, only: :new
rescue_from ActionController::InvalidAuthenticityToken do
redirect_to new_user_session_path
@ -75,15 +75,14 @@ class Users::SessionsController < Devise::SessionsController
flash[:system_notification_modal] = true
end
protected
# If you have extra params to permit, append them to the sanitizer.
def configure_sign_in_params
devise_parameter_sanitizer.for(:sign_in) << :attribute
end
private
def remove_authenticate_mesasge_if_root_path
if session[:user_return_to] == root_path && flash[:alert] == I18n.t('devise.failure.unauthenticated')
flash[:alert] = nil
end
end
def session_layout
if @simple_sign_in
'sign_in_halt'