From c4ead607da38e05f7c17a7bf420fff65fc0b38cd Mon Sep 17 00:00:00 2001 From: Stas Date: Mon, 11 Jan 2016 17:02:35 +0200 Subject: [PATCH] 107279984-refactor --- .../admin/account_activities_controller.rb | 31 ------------------- 1 file changed, 31 deletions(-) diff --git a/app/controllers/admin/account_activities_controller.rb b/app/controllers/admin/account_activities_controller.rb index 1419dbea9..0f095734f 100644 --- a/app/controllers/admin/account_activities_controller.rb +++ b/app/controllers/admin/account_activities_controller.rb @@ -22,46 +22,15 @@ class Admin::AccountActivitiesController < AdminController @b = AccountActivity.search(balance_params) @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(",") - if params[:page] && params[:page].to_i > 1 - - @sum = @q.result.reorder(sort).limit(@account_activities.offset_value) + @b.result.where.not(id: @q.result.map(&:id)) - else - @sum = @b.result.where.not(id: @q.result.map(&:id)) - - end - - - - - - # throw "cdsfs" - - # if params[:page] && params[:page].to_i > 1 - # - # @b = @q.result.page(params[:page].to_i - 1) - # - # @b = @b.per(params[:results_per_page]) - # - # - # else - # - # @b = AccountActivity.search(balance_params) - # - # @b = @b.result.where.not(id: @q.result.map(&:id)) - # - # end - respond_to do |format| format.html format.csv do