zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 10 Releases Wiki Activity

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
This commit is contained in:
Matt Jankowski 2017-04-12 10:12:56 -04:00 committed by Eugen
parent dd1ae3b109
commit 13528f50c3
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/helpers/admin/accounts_helper.rb
View File

@ -6,10 +6,21 @@ module Admin::AccountsHelper
end end
def filter_link_to(text, more_params) 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 end
def table_link_to(icon, text, path, options = {}) def table_link_to(icon, text, path, options = {})
link_to safe_join([fa_icon(icon), text]), path, options.merge(class: 'table-action-link') link_to safe_join([fa_icon(icon), text]), path, options.merge(class: 'table-action-link')
end 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 end