zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-05-21 19:59:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

107279984-filter_changes

Browse source
This commit is contained in:
Stas 2016-01-11 15:44:26 +02:00
parent cbe0193cbf
commit 96552a0344
2 changed files with 49 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -19,11 +19,51 @@ class Admin::AccountActivitiesController < AdminController
end
@q = AccountActivity.includes(:invoice, account: :registrar).search(params[:q])
@b = AccountActivity.search(balance_params)
@q.sorts = 'id desc' if @q.sorts.empty?
@b = AccountActivity.search(balance_params).result.where.not(id: @q.result.map(&:id))
@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 { @account_activities = @q.result.page(params[:page]) }
format.html
format.csv do
send_data @q.result.to_csv, filename: "account_activities_#{Time.zone.now.to_formatted_s(:number)}.csv"
end