Skip to content

Commit

Permalink
Improve how params from controller are permitted in filter helper (ma…
Browse files Browse the repository at this point in the history
…stodon#3129)

The `params` variable here was quite overloaded.

It exists via the controller to hold the request params, and was sometimes being
used in this helper as that object, but other times was being used as a local
variable, or to pass to another method, and this was confusing.

This change renames the args for a method away from `params` for more clarity,
and extracts the actual usage of the controller-provided `params` to a
better-named method for clarity.
  • Loading branch information
mjankowski authored and Gargron committed May 19, 2017
1 parent b8b7b50 commit 8e4fc5d
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions app/helpers/admin/filter_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,18 @@ def table_link_to(icon, text, path, options = {})
private

def filter_params(more_params)
params.permit(FILTERS).merge(more_params)
controller_request_params.merge(more_params)
end

def filter_link_class(new_url)
filtered_url_for(params) == new_url ? 'selected' : ''
filtered_url_for(controller_request_params) == new_url ? 'selected' : ''
end

def filtered_url_for(params)
url_for filter_params(params)
def filtered_url_for(url_params)
url_for filter_params(url_params)
end

def controller_request_params
params.permit(FILTERS)
end
end

0 comments on commit 8e4fc5d

Please sign in to comment.