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

Evaluate ransackable_scopes before attributes

This commit is contained in:
Farrukh Abdulkadyrov 2017-02-03 17:43:15 -05:00 committed by Farrukh Abdulkadyrov
parent 0fcf1b5ebf
commit 4589d5a385
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/ransack/search.rb
View File

@ -43,10 +43,10 @@ module Ransack
collapse_multiparameter_attributes!(params).each do |key, value| collapse_multiparameter_attributes!(params).each do |key, value|
if ['s'.freeze, 'sorts'.freeze].freeze.include?(key) if ['s'.freeze, 'sorts'.freeze].freeze.include?(key)
send("#{key}=", value) send("#{key}=", value)
elsif base.attribute_method?(key)
base.send("#{key}=", value)
elsif @context.ransackable_scope?(key, @context.object) elsif @context.ransackable_scope?(key, @context.object)
add_scope(key, value) add_scope(key, value)
elsif base.attribute_method?(key)
base.send("#{key}=", value)
elsif !Ransack.options[:ignore_unknown_conditions] || !@ignore_unknown_conditions elsif !Ransack.options[:ignore_unknown_conditions] || !@ignore_unknown_conditions
raise ArgumentError, "Invalid search term #{key}" raise ArgumentError, "Invalid search term #{key}"
end end