diff --git a/app/controllers/admin/epp_logs_controller.rb b/app/controllers/admin/epp_logs_controller.rb index e375a859f..d2ba615fc 100644 --- a/app/controllers/admin/epp_logs_controller.rb +++ b/app/controllers/admin/epp_logs_controller.rb @@ -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_lteq])) if params[:q][:created_at_lteq].present? @epp_logs = @epp_logs.page(params[:page]) - @count = @q.result.count @epp_logs = @epp_logs.per(params[:results_per_page]) if paginate? render_by_format('admin/epp_logs/index', 'epp_logs') diff --git a/app/views/admin/epp_logs/index.haml b/app/views/admin/epp_logs/index.haml index 43596b317..e657bd7fe 100644 --- a/app/views/admin/epp_logs/index.haml +++ b/app/views/admin/epp_logs/index.haml @@ -49,7 +49,7 @@ = paginate @epp_logs .pull-right .pagination - = t(:result_count, count: @count) if @count > 0 + = t(:result_count, count: @epp_logs.total_count) if @epp_logs.total_count.positive? .row .table-responsive %table.table.table-hover.table-bordered.table-condensed @@ -76,4 +76,4 @@ = paginate @epp_logs .pull-right .pagination - = t(:result_count, count: @count) + = t(:result_count, count: @epp_logs.total_count) if @epp_logs.total_count.positive?