From 6cc0f7d58b1dee7ffba3cc93402f2167f489413f Mon Sep 17 00:00:00 2001 From: Alex Sherman Date: Thu, 11 Jun 2020 14:40:02 +0500 Subject: [PATCH] Fix account activity index Fixes #1606 --- app/controllers/admin/account_activities_controller.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/admin/account_activities_controller.rb b/app/controllers/admin/account_activities_controller.rb index 6a37e36dc..e022843ff 100644 --- a/app/controllers/admin/account_activities_controller.rb +++ b/app/controllers/admin/account_activities_controller.rb @@ -23,11 +23,11 @@ module Admin @q.sorts = 'id desc' if @q.sorts.empty? @account_activities = @q.result.page(params[:page]).per(params[:results_per_page]) - sort = @account_activities.orders.map(&:to_sql).join(",") - # can do here inline SQL as it's our if params[:page] && params[:page].to_i > 1 - @sum = @q.result.reorder(sort).limit(@account_activities.offset_value).sum(:sum) + @b.result.where("account_activities.id NOT IN (#{@q.result.select(:id).to_sql})").sum(:sum) + @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