diff options
author | Matt Jankowski <mjankowski@thoughtbot.com> | 2017-04-12 10:12:56 -0400 |
---|---|---|
committer | Eugen <eugen@zeonfederated.com> | 2017-04-12 16:12:56 +0200 |
commit | 13528f50c32a5035fcf8b9f24b9f0eb113fc776f (patch) | |
tree | 440e17b602ebe244bd7d42e26147e9c35dbdea5a /app/helpers/admin | |
parent | dd1ae3b10924ca239daa17ce2fe739f790e6f96d (diff) |
Params compact deprecation warning (#1580)
* Move filter_link_to class formation to separate method in admin/accounts helper * Remove deprecated #compact method usage on strong parameters
Diffstat (limited to 'app/helpers/admin')
-rw-r--r-- | app/helpers/admin/accounts_helper.rb | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/app/helpers/admin/accounts_helper.rb b/app/helpers/admin/accounts_helper.rb index c539229b3..6cda77819 100644 --- a/app/helpers/admin/accounts_helper.rb +++ b/app/helpers/admin/accounts_helper.rb @@ -6,10 +6,21 @@ module Admin::AccountsHelper end def filter_link_to(text, more_params) - link_to text, filter_params(more_params), class: params.merge(more_params).compact == params.compact ? 'selected' : '' + new_url = filtered_url_for(more_params) + link_to text, new_url, class: filter_link_class(new_url) end def table_link_to(icon, text, path, options = {}) link_to safe_join([fa_icon(icon), text]), path, options.merge(class: 'table-action-link') end + + private + + def filter_link_class(new_url) + filtered_url_for(params) == new_url ? 'selected' : '' + end + + def filtered_url_for(params) + url_for filter_params(params) + end end |