Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix 'permit' params to allow multiple form inputs for a single scope #115

Merged
merged 7 commits into from Mar 8, 2017
Merged

Fix 'permit' params to allow multiple form inputs for a single scope #115

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
53e12f3
Fix 'permit' params to allow multiple form inputs for a single scope
ayaman Nov 24, 2016
c79defb
Whitelist params of type ActionController::Parameters in the same way…
edwardmp Dec 3, 2016
91433ed
Just check for ActionController::Parameters as p is always of this type
edwardmp Dec 3, 2016
b0b8b90
Merge pull request #1 from edwardmp/whitelist-actioncontroller-parame…
ayaman Dec 4, 2016
3cb4bba
Properly permit array params
blaedj Feb 14, 2017
b2f812a
Check for ActionController::Parameters rather than hash
blaedj Feb 15, 2017
292ecd9
Merge pull request #2 from blaedj/master
ayaman Feb 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 11 additions & 1 deletion lib/filterrific/param_set.rb
View file
Open in desktop
Expand Up @@ -29,7 +29,17 @@ def initialize(a_model_class, filterrific_params = {})
# will be already initialized with the defaults.
filterrific_params = model_class.filterrific_default_filter_params if filterrific_params.blank?
if defined?(ActionController::Parameters) && filterrific_params.is_a?(ActionController::Parameters)
filterrific_params = filterrific_params.permit(model_class.filterrific_available_filters).to_h.stringify_keys
permissible_filter_params = []
model_class.filterrific_available_filters.each do |p|
if filterrific_params[p].is_a?(ActionController::Parameters)
permissible_filter_params << { p => filterrific_params[p].keys }
elsif filterrific_params[p].is_a?(Array)
permissible_filter_params << { p => [] }
else
permissible_filter_params << p
end
end
filterrific_params = filterrific_params.permit(permissible_filter_params).to_h.stringify_keys
else
filterrific_params.stringify_keys!
end
Expand Down