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

Fix sanitize_params method #137

Closed
wants to merge 5 commits into from
Closed

Fix sanitize_params method #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bddb589
Fix sanitize_params method
Jan 12, 2018
aa4792c
Fix strong params issue
Jan 24, 2018
413cb7d
Dealing with Strong Params in Kaminari's way
Jan 30, 2018
98b0eab
Correct the Readme file
Feb 21, 2018
c37e6a4
Correct the Readme file
Feb 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 3 additions & 10 deletions app/helpers/smart_listing/helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ def _prefixes
end

class Builder
# Params that should not be visible in pagination links (pages, per-page, sorting, etc.)
UNSAFE_PARAMS = {:authenticity_token => nil, :utf8 => nil}

class_attribute :smart_listing_helpers

Expand All @@ -48,7 +46,7 @@ def name

def paginate options = {}
if @smart_listing.collection.respond_to? :current_page
@template.paginate @smart_listing.collection, {:remote => @smart_listing.remote?, :param_name => @smart_listing.param_name(:page), :params => UNSAFE_PARAMS}.merge(@smart_listing.kaminari_options)
@template.paginate @smart_listing.collection, {:remote => @smart_listing.remote?, :param_name => @smart_listing.param_name(:page)}.merge(@smart_listing.kaminari_options)
end
end

Expand Down Expand Up @@ -78,7 +76,7 @@ def pagination_per_page_links options = {}

def pagination_per_page_link page
if @smart_listing.per_page.to_i != page
url = @template.url_for(sanitize_params(@template.params.merge(@smart_listing.all_params(:per_page => page, :page => 1))))
url = @template.url_for(@smart_listing.params.merge(@smart_listing.all_params(:per_page => page, :page => 1)))
end

locals = {
Expand All @@ -100,7 +98,7 @@ def sortable title, attribute, options = {}

locals = {
:order => @smart_listing.sort_order(attribute),
:url => @template.url_for(sanitize_params(@template.params.merge(@smart_listing.all_params(:sort => sort_params)))),
:url => @template.url_for(@smart_listing.params.merge(@smart_listing.all_params(:sort => sort_params))),
:container_classes => [@template.smart_listing_config.classes(:sortable)],
:attribute => attribute,
:title => title
Expand Down Expand Up @@ -180,11 +178,6 @@ def max_count?

private

def sanitize_params params
params = params.permit! if params.respond_to?(:permit!)
params.merge(UNSAFE_PARAMS)
end

def default_locals
{:smart_listing => @smart_listing, :builder => self}
end
Expand Down
7 changes: 6 additions & 1 deletion lib/smart_listing.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ def page_param(page)

module SmartListing
class Base
attr_reader :name, :collection, :options, :per_page, :sort, :page, :partial, :count
attr_reader :name, :collection, :options, :per_page, :sort, :page, :partial, :count, :params
# Params that should not be visible in pagination links (pages, per-page, sorting, etc.)
UNSAFE_PARAMS = [:authenticity_token, :commit, :utf8, :_method, :script_name].freeze

def initialize name, collection, options = {}
@name = name
Expand All @@ -46,6 +48,9 @@ def initialize name, collection, options = {}

def setup params, cookies
@params = params
@params = @params.to_unsafe_h if @params.respond_to?(:to_unsafe_h)
@params = @params.with_indifferent_access
@params.except!(*UNSAFE_PARAMS)

@page = get_param :page
@per_page = !get_param(:per_page) || get_param(:per_page).empty? ? (@options[:memorize_per_page] && get_param(:per_page, cookies).to_i > 0 ? get_param(:per_page, cookies).to_i : page_sizes.first) : get_param(:per_page).to_i
Expand Down