Skip to content

Commit

Permalink
Merge pull request #1896 from projectblacklight/remove-discard-flash
Browse files Browse the repository at this point in the history
Remove deprecated method: discard_flash_if_xhr
  • Loading branch information
Jessie Keck committed Jun 6, 2018
2 parents efe3d8f + ddf1004 commit 2455f95
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions app/controllers/concerns/blacklight/controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ module Blacklight::Controller

# now in application.rb file under config.filter_parameters
# filter_parameter_logging :password, :password_confirmation
after_action :discard_flash_if_xhr

# handle basic authorization exception with #access_denied
rescue_from Blacklight::Exceptions::AccessDenied, with: :access_denied
Expand Down Expand Up @@ -117,13 +116,6 @@ def current_or_guest_user
end
alias blacklight_current_or_guest_user current_or_guest_user

##
# We discard flash messages generated by the xhr requests to avoid
# confusing UX.
def discard_flash_if_xhr
flash.discard if request.xhr?
end

##
#
#
Expand Down

0 comments on commit 2455f95

Please sign in to comment.