kotovalexarian-likes-github
/
activerecord-hackery--ransack
mirror of https://github.com/activerecord-hackery/ransack.git
1
0
Fork 0
Code Releases Activity

Rails 5 params: instance_variable_get -> to_unsafe_h 

`search_params` didn’t need this behavior because it’s using the
`@params` variable that’s already ready for use
This commit is contained in:
Sean Linsley 2016-01-04 10:36:41 -06:00
parent ceb136f252
commit 989d69f523
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/ransack/helpers/form_helper.rb
View File

@ -86,7 +86,7 @@ module Ransack
class SortLink
def initialize(search, attribute, args, params)
@search = search
@params = parameters_hash(params)
@params = params.respond_to?(:to_unsafe_h) ? params.to_unsafe_h : params
@field = attribute.to_s
@sort_fields = extract_sort_fields_and_mutate_args!(args).compact
@current_dir = existing_sort_direction
@ -120,11 +120,6 @@ module Ransack
private
def parameters_hash(params)
return params unless params.instance_variable_defined?(:@parameters)
params.instance_variable_get(:@parameters)
end
def extract_sort_fields_and_mutate_args!(args)
return args.shift if args[0].is_a?(Array)
[@field]
@ -145,7 +140,7 @@ module Ransack
end
def search_params
parameters_hash(@params[@search.context.search_key]).presence || {}
@params[@search.context.search_key].presence || {}
end
def sort_params

4
lib/ransack/search.rb
View File

@ -15,9 +15,7 @@ module Ransack
:translate, :to => :base
def initialize(object, params = {}, options = {})
if params.instance_variable_defined?(:@parameters)
params = params.instance_variable_get :@parameters
end
params = params.to_unsafe_h if params.respond_to?(:to_unsafe_h)
if params.is_a? Hash
params = params.dup
params.delete_if { |k, v| [*v].all?{ |i| i.blank? && i != false } }