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

removed count request

Browse source
This commit is contained in:
dinsmol 2021-08-29 21:31:14 +03:00
parent b5b263f4b2
commit 283bd2090e
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/controllers/admin/epp_logs_controller.rb
View file

@ -11,7 +11,6 @@ module Admin
@epp_logs = @epp_logs.where("extract(epoch from created_at) >= extract(epoch from ?::timestamp)", Time.parse(params[:q][:created_at_gteq])) if params[:q][:created_at_gteq].present? @epp_logs = @epp_logs.where("extract(epoch from created_at) >= extract(epoch from ?::timestamp)", Time.parse(params[:q][:created_at_gteq])) if params[:q][:created_at_gteq].present?
@epp_logs = @epp_logs.where("extract(epoch from created_at) <= extract(epoch from ?::timestamp)", Time.parse(params[:q][:created_at_lteq])) if params[:q][:created_at_lteq].present? @epp_logs = @epp_logs.where("extract(epoch from created_at) <= extract(epoch from ?::timestamp)", Time.parse(params[:q][:created_at_lteq])) if params[:q][:created_at_lteq].present?
@epp_logs = @epp_logs.page(params[:page]) @epp_logs = @epp_logs.page(params[:page])
@count = @q.result.count
@epp_logs = @epp_logs.per(params[:results_per_page]) if paginate? @epp_logs = @epp_logs.per(params[:results_per_page]) if paginate?
render_by_format('admin/epp_logs/index', 'epp_logs') render_by_format('admin/epp_logs/index', 'epp_logs')

4
app/views/admin/epp_logs/index.haml
View file

@ -49,7 +49,7 @@
= paginate @epp_logs = paginate @epp_logs
.pull-right .pull-right
.pagination .pagination
= t(:result_count, count: @count) if @count > 0 = t(:result_count, count: @epp_logs.total_count) if @epp_logs.total_count.positive?
.row .row
.table-responsive .table-responsive
%table.table.table-hover.table-bordered.table-condensed %table.table.table-hover.table-bordered.table-condensed
@ -76,4 +76,4 @@
= paginate @epp_logs = paginate @epp_logs
.pull-right .pull-right
.pagination .pagination
= t(:result_count, count: @count) = t(:result_count, count: @epp_logs.total_count) if @epp_logs.total_count.positive?