zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-28 21:46:24 +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

13
app/controllers/admin/account_activities_controller.rb
View file

@ -25,13 +25,12 @@ module Admin
@account_activities = @q.result.page(params[:page]).per(params[:results_per_page])
@count = @q.result.count
if params[:page] && params[:page].to_i > 1
@sum = @q.result.limit(@account_activities.offset_value).sum(:sum) +
@b.result.where("account_activities.id NOT IN (#{@q.result.select(:id).to_sql})")
.sum(:sum)
else
@sum = @b.result.where("account_activities.id NOT IN (#{@q.result.select(:id).to_sql})").sum(:sum)
end
@sum = if params[:page] && params[:page].to_i > 1
@q.result.limit(@account_activities.offset_value).sum(:sum) +
@b.result.where("account_activities.id NOT IN (#{@q.result.select(:id).to_sql})").sum(:sum)
else
@b.result.where("account_activities.id NOT IN (#{@q.result.select(:id).to_sql})").sum(:sum)
end
respond_to do |format|
format.html