zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-25 20:18:22 +02:00
Code Issues Projects Releases Packages Wiki Activity

fixed admin pagination

Browse source
This commit is contained in:
dinsmol 2021-07-29 15:26:44 +03:00
parent f81c06673c
commit 11029e83ce
25 changed files with 126 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -23,6 +23,7 @@ module Admin
@q.sorts = 'id desc' if @q.sorts.empty?
@account_activities = @q.result.page(params[:page]).per(params[:results_per_page])
@count = @q.result.count
if params[:page] && params[:page].to_i > 1
@sum = @q.result.limit(@account_activities.offset_value).sum(:sum) +

2
app/controllers/admin/admin_users_controller.rb
View file

@ -6,6 +6,8 @@ module Admin
def index
@q = AdminUser.search(params[:q])
@admin_users = @q.result.page(params[:page]).order(:username)
@count = @q.result.count
@admin_users = @admin_users.per(params[:results_per_page]) if params[:results_per_page].to_i.positive?
end
def new

2
app/controllers/admin/api_users_controller.rb
View file

@ -5,6 +5,8 @@ module Admin
def index
@q = ApiUser.includes(:registrar).search(params[:q])
@api_users = @q.result.page(params[:page])
@count = @q.result.count
@api_users = @api_users.per(params[:results_per_page]) if params[:results_per_page].to_i.positive?
end
def new

2
app/controllers/admin/bank_statements_controller.rb
View file

@ -8,6 +8,8 @@ module Admin
@q = BankStatement.search(params[:q])
@q.sorts = 'id desc' if @q.sorts.empty?
@bank_statements = @q.result.page(params[:page])
@count = @q.result.count
@bank_statements = @bank_statements.per(params[:results_per_page]) if params[:results_per_page].to_i.positive?
end
def show

2
app/controllers/admin/billing/prices_controller.rb
View file

@ -29,6 +29,8 @@ module Admin
@q.sorts = ['zone_id asc', 'duration asc', 'operation_category asc',
'valid_from desc', 'valid_to asc'] if @q.sorts.empty?
@prices = @q.result.page(params[:page])
@count = @q.result.count
@prices = @q.result.page(params[:page]).per(params[:results_per_page])
end
def new

4
app/controllers/admin/bounced_mail_addresses_controller.rb
View file

@ -5,7 +5,9 @@ module Admin
# GET /bounced_mail_addresses
def index
@bounced_mail_addresses = BouncedMailAddress.all.order(created_at: :desc)
@q = BouncedMailAddress.all.order(created_at: :desc).search(params[:q])
@bounced_mail_addresses = @q.result.page(params[:page]).per(params[:results_per_page])
@count = @q.result.count
end
# GET /bounced_mail_addresses/1

4
app/controllers/admin/dns/zones_controller.rb
View file

@ -5,7 +5,9 @@ module Admin
before_action :load_zone, only: %i[edit update destroy]
def index
@zones = ::DNS::Zone.all
@q = ::DNS::Zone.search(params[:q])
@count = @q.result.count
@zones = @q.result.page(params[:page]).per(params[:results_per_page])
end
def new

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

@ -11,6 +11,8 @@ 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 params[:results_per_page].to_i.positive?
end
def show

2
app/controllers/admin/invoices_controller.rb
View file

@ -36,6 +36,8 @@ module Admin
@q = Invoice.includes(:account_activity).search(params[:q])
@q.sorts = 'number desc' if @q.sorts.empty?
@invoices = @q.result.page(params[:page])
@count = @q.result.count
@invoices = @invoices.per(params[:results_per_page]) if params[:results_per_page].to_i.positive?
end
def show; end

2
app/controllers/admin/registrars_controller.rb
View file

@ -8,6 +8,8 @@ module Admin
def index
@q = Registrar.joins(:accounts).ordered.search(params[:q])
@registrars = @q.result.page(params[:page])
@count = @q.result.count
@registrars = @registrars.per(params[:results_per_page]) if params[:results_per_page].to_i.positive?
end
def new

2
app/controllers/admin/repp_logs_controller.rb
View file

@ -11,6 +11,8 @@ module Admin
@repp_logs = @repp_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?
@repp_logs = @repp_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?
@repp_logs = @repp_logs.page(params[:page])
@count = @q.result.count
@repp_logs = @repp_logs.per(params[:results_per_page]) if params[:results_per_page].to_i.positive?
end
def show

2
app/controllers/repp/v1/base_controller.rb
View file

@ -120,7 +120,7 @@ module Repp
end
def validate_webclient_ca
return unless webclient_request?
return if webclient_request?
request_name = request.env['HTTP_SSL_CLIENT_S_DN_CN']
webclient_cn = ENV['webclient_cert_common_name'] || 'webclient'