zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-06-10 06:34:46 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into fix-for-ransack-deprecated-method

Browse source
This commit is contained in:
Dinar Safiulin 2021-09-14 13:50:18 +03:00 • committed by GitHub
commit 9cafc98482
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
171 changed files with 1061 additions and 726 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/controllers/admin/contact_versions_controller.rb
View file

@ -11,20 +11,22 @@ module Admin
@versions = @q.result.page(params[:page])
search_params = params[:q].deep_dup
whereS = "1=1"
where_s = "1=1"
search_params.each do |key, value|
next if value.empty?
case key
when 'event'
whereS += " AND event = '#{value}'"
else
whereS += create_where_string(key, value)
end
where_s += case key
when 'event'
" AND event = '#{value}'"
else
create_where_string(key, value)
end
end
versions = Version::ContactVersion.includes(:item).where(whereS).order(created_at: :desc, id: :desc)
@q = versions.ransack(params[:q])
@versions = @q.result.page(params[:page])
@versions = @versions.per(params[:results_per_page]) if params[:results_per_page].to_i.positive?