From 11029e83ce442112fa3ed676b458b1b55b55bfb9 Mon Sep 17 00:00:00 2001
From: dinsmol <dinar184@mail.ru>
Date: Thu, 29 Jul 2021 15:26:44 +0300
Subject: [PATCH 1/6] fixed admin pagination

---
 .../admin/account_activities_controller.rb      |  1 +
 app/controllers/admin/admin_users_controller.rb |  2 ++
 app/controllers/admin/api_users_controller.rb   |  2 ++
 .../admin/bank_statements_controller.rb         |  2 ++
 .../admin/billing/prices_controller.rb          |  2 ++
 .../admin/bounced_mail_addresses_controller.rb  |  4 +++-
 app/controllers/admin/dns/zones_controller.rb   |  4 +++-
 app/controllers/admin/epp_logs_controller.rb    |  2 ++
 app/controllers/admin/invoices_controller.rb    |  2 ++
 app/controllers/admin/registrars_controller.rb  |  2 ++
 app/controllers/admin/repp_logs_controller.rb   |  2 ++
 app/controllers/repp/v1/base_controller.rb      |  2 +-
 app/views/admin/account_activities/index.haml   |  5 ++++-
 app/views/admin/admin_users/index.haml          |  5 ++++-
 app/views/admin/api_users/index.html.erb        |  9 ++++++++-
 app/views/admin/bank_statements/index.haml      |  6 +++++-
 .../admin/billing/prices/_search_form.html.erb  | 13 ++++++++-----
 app/views/admin/billing/prices/index.html.erb   |  7 ++++++-
 .../admin/bounced_mail_addresses/index.html.erb | 12 ++++++++++++
 app/views/admin/dns/zones/index.html.erb        | 11 +++++++++++
 app/views/admin/epp_logs/index.haml             |  6 ++++++
 app/views/admin/invoices/index.haml             |  7 ++++++-
 app/views/admin/registrars/index.html.erb       |  9 ++++++++-
 app/views/admin/repp_logs/index.haml            |  7 +++++++
 app/views/application/_pagination.html.erb      | 17 +++++++++++++++++
 25 files changed, 126 insertions(+), 15 deletions(-)
 create mode 100644 app/views/application/_pagination.html.erb

diff --git a/app/controllers/admin/account_activities_controller.rb b/app/controllers/admin/account_activities_controller.rb
index e022843ff..cb34d1645 100644
--- a/app/controllers/admin/account_activities_controller.rb
+++ b/app/controllers/admin/account_activities_controller.rb
@@ -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) +
diff --git a/app/controllers/admin/admin_users_controller.rb b/app/controllers/admin/admin_users_controller.rb
index 3d0c4280b..f2e11674d 100644
--- a/app/controllers/admin/admin_users_controller.rb
+++ b/app/controllers/admin/admin_users_controller.rb
@@ -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
diff --git a/app/controllers/admin/api_users_controller.rb b/app/controllers/admin/api_users_controller.rb
index 8876c726f..ccdd1c526 100644
--- a/app/controllers/admin/api_users_controller.rb
+++ b/app/controllers/admin/api_users_controller.rb
@@ -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
diff --git a/app/controllers/admin/bank_statements_controller.rb b/app/controllers/admin/bank_statements_controller.rb
index 4295c155f..ced157e4d 100644
--- a/app/controllers/admin/bank_statements_controller.rb
+++ b/app/controllers/admin/bank_statements_controller.rb
@@ -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
diff --git a/app/controllers/admin/billing/prices_controller.rb b/app/controllers/admin/billing/prices_controller.rb
index 4c1e2e30a..e8610c365 100644
--- a/app/controllers/admin/billing/prices_controller.rb
+++ b/app/controllers/admin/billing/prices_controller.rb
@@ -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
diff --git a/app/controllers/admin/bounced_mail_addresses_controller.rb b/app/controllers/admin/bounced_mail_addresses_controller.rb
index 1c59acaa4..eae306477 100644
--- a/app/controllers/admin/bounced_mail_addresses_controller.rb
+++ b/app/controllers/admin/bounced_mail_addresses_controller.rb
@@ -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
diff --git a/app/controllers/admin/dns/zones_controller.rb b/app/controllers/admin/dns/zones_controller.rb
index 1e773986b..42bb553a3 100644
--- a/app/controllers/admin/dns/zones_controller.rb
+++ b/app/controllers/admin/dns/zones_controller.rb
@@ -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
diff --git a/app/controllers/admin/epp_logs_controller.rb b/app/controllers/admin/epp_logs_controller.rb
index 05a19eb1c..2d72c068c 100644
--- a/app/controllers/admin/epp_logs_controller.rb
+++ b/app/controllers/admin/epp_logs_controller.rb
@@ -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
diff --git a/app/controllers/admin/invoices_controller.rb b/app/controllers/admin/invoices_controller.rb
index bd54ffd0b..3129b0d8e 100644
--- a/app/controllers/admin/invoices_controller.rb
+++ b/app/controllers/admin/invoices_controller.rb
@@ -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
diff --git a/app/controllers/admin/registrars_controller.rb b/app/controllers/admin/registrars_controller.rb
index 27116d871..534d2f248 100644
--- a/app/controllers/admin/registrars_controller.rb
+++ b/app/controllers/admin/registrars_controller.rb
@@ -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
diff --git a/app/controllers/admin/repp_logs_controller.rb b/app/controllers/admin/repp_logs_controller.rb
index fb1f7286b..e4e3c3481 100644
--- a/app/controllers/admin/repp_logs_controller.rb
+++ b/app/controllers/admin/repp_logs_controller.rb
@@ -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
diff --git a/app/controllers/repp/v1/base_controller.rb b/app/controllers/repp/v1/base_controller.rb
index 37d4b95be..b9440d226 100644
--- a/app/controllers/repp/v1/base_controller.rb
+++ b/app/controllers/repp/v1/base_controller.rb
@@ -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'
diff --git a/app/views/admin/account_activities/index.haml b/app/views/admin/account_activities/index.haml
index 2e1d57dc6..f1aba64f7 100644
--- a/app/views/admin/account_activities/index.haml
+++ b/app/views/admin/account_activities/index.haml
@@ -46,5 +46,8 @@
             %td{class: 'text-right'}= t(:total)
             %td{class: total > 0 ? 'text-success' : 'text-danger'}= total > 0 ? "+#{total} EUR" : "#{total} EUR"
 .row
-  .col-md-12
+  .col-md-6
     = paginate @account_activities
+  .col-md-6.text-right
+    .pagination
+      = t(:result_count, count: @count)
diff --git a/app/views/admin/admin_users/index.haml b/app/views/admin/admin_users/index.haml
index 1fbc73609..0f7bb711e 100644
--- a/app/views/admin/admin_users/index.haml
+++ b/app/views/admin/admin_users/index.haml
@@ -1,6 +1,7 @@
 - content_for :actions do
   = link_to(t('.new_btn'), new_admin_admin_user_path, class: 'btn btn-primary')
 = render 'shared/title', name: t('.title')
+= render 'application/pagination'
 
 .row
   .col-md-12
@@ -27,5 +28,7 @@
               - else
                 %td
 .row
-  .col-md-12
+  .col-md-6
     = paginate @admin_users
+  .col-md-6.text-right
+    = t(:result_count, count: @count)
diff --git a/app/views/admin/api_users/index.html.erb b/app/views/admin/api_users/index.html.erb
index 9c00f32d6..a622a06a2 100644
--- a/app/views/admin/api_users/index.html.erb
+++ b/app/views/admin/api_users/index.html.erb
@@ -2,6 +2,8 @@
     <h1><%= t '.header' %></h1>
 </div>
 
+<%= render 'application/pagination' %>
+
 <div class="row">
     <div class="col-md-12">
         <div class="table-responsive">
@@ -29,7 +31,12 @@
 </div>
 
 <div class="row">
-    <div class="col-md-12">
+    <div class="col-md-6">
         <%= paginate @api_users %>
     </div>
+    <div class="col-md-6 text-right">
+        <div class="pagination">
+            <%= t(:result_count, count: @count) %>
+        </div>
+    </div>
 </div>
diff --git a/app/views/admin/bank_statements/index.haml b/app/views/admin/bank_statements/index.haml
index f04557b0b..a9d9cfa53 100644
--- a/app/views/admin/bank_statements/index.haml
+++ b/app/views/admin/bank_statements/index.haml
@@ -1,6 +1,7 @@
 - content_for :actions do
   = link_to(t(:add), new_admin_bank_statement_path, class: 'btn btn-primary')
 = render 'shared/title', name: t(:bank_statements)
+= render 'application/pagination'
 
 .row
   .col-md-12
@@ -28,5 +29,8 @@
               - sc = 'text-danger' if x.not_binded?
               %td{class: sc}= t(x.status)
 .row
-  .col-md-12
+  .col-md-6
     = paginate @bank_statements
+  .col-md-6.text-right
+    .pagination
+      = t(:result_count, count: @count)
diff --git a/app/views/admin/billing/prices/_search_form.html.erb b/app/views/admin/billing/prices/_search_form.html.erb
index 898cf9602..be61f632b 100644
--- a/app/views/admin/billing/prices/_search_form.html.erb
+++ b/app/views/admin/billing/prices/_search_form.html.erb
@@ -2,18 +2,21 @@
     <div class="form-group">
         <%= f.label :status, class: 'col-sm-2 control-label' %>
 
-        <div class="col-sm-3">
+        <div class="col-sm-2">
             <%= f.select :status, options_for_select(statuses, search.status), { include_blank: t('.all') },
                          class: 'form-control' %>
         </div>
-    </div>
 
-    <div class="form-group">
-        <div class="col-sm-offset-2 col-sm-8">
+        <%= f.label :results_per_page, class: 'col-sm-2 control-label' %>
+
+        <div class="col-md-2">
+            <%= text_field_tag :results_per_page, params[:results_per_page], class: 'form-control', placeholder: t(:results_per_page) %>
+        </div>
+
+        <div class="col-sm-3">
             <%= f.submit t('.search_btn'), class: 'btn btn-primary', name: nil %>
             <%= link_to t('.reset_btn'), admin_prices_path,
                         class: 'btn btn-default price-search-form-search-btn' %>
         </div>
     </div>
-
 <% end %>
diff --git a/app/views/admin/billing/prices/index.html.erb b/app/views/admin/billing/prices/index.html.erb
index 31d74dc96..3efabaa76 100644
--- a/app/views/admin/billing/prices/index.html.erb
+++ b/app/views/admin/billing/prices/index.html.erb
@@ -33,9 +33,14 @@
     </table>
 
     <div class="row">
-        <div class="col-md-12">
+        <div class="col-md-6">
             <%= paginate @prices %>
         </div>
+        <div class="col-md-6 text-right">
+            <div class="pagination">
+                <%= t(:result_count, count: @count) %>
+            </div>
+        </div>
     </div>
 <% else %>
     <div class="alert alert-info"><%= t '.not_found' %></div>
diff --git a/app/views/admin/bounced_mail_addresses/index.html.erb b/app/views/admin/bounced_mail_addresses/index.html.erb
index 913cbd19d..92f9a358a 100644
--- a/app/views/admin/bounced_mail_addresses/index.html.erb
+++ b/app/views/admin/bounced_mail_addresses/index.html.erb
@@ -1,5 +1,7 @@
 <h1>Bounced Mail Addresses</h1>
 
+<%= render 'application/pagination' %>
+
 <div class="row">
     <div class="row">
         <div class="col-md-12">
@@ -34,3 +36,13 @@
         </div>
     </div>
 </div>
+<div class="row">
+    <div class="col-md-6">
+        <%= paginate @bounced_mail_addresses %>
+    </div>
+    <div class="col-md-6 text-right">
+        <div class="pagination">
+            <%= t(:result_count, count: @count) %>
+        </div>
+    </div>
+</div>
diff --git a/app/views/admin/dns/zones/index.html.erb b/app/views/admin/dns/zones/index.html.erb
index eb945873e..1068f3c7b 100644
--- a/app/views/admin/dns/zones/index.html.erb
+++ b/app/views/admin/dns/zones/index.html.erb
@@ -11,6 +11,7 @@
 </div>
 
 <% if @zones.present? %>
+    <%= render 'application/pagination' %>
     <table class="table table-hover table-bordered table-wrapped">
         <thead>
             <tr>
@@ -26,3 +27,13 @@
 <% else %>
     <div class="alert alert-info"><%= t '.not_found' %></div>
 <% end %>
+<div class="row">
+    <div class="col-md-6">
+        <%= paginate @zones %>
+    </div>
+    <div class="col-md-6 text-right">
+        <div class="pagination">
+            <%= t(:result_count, count: @count) %>
+        </div>
+    </div>
+</div>
diff --git a/app/views/admin/epp_logs/index.haml b/app/views/admin/epp_logs/index.haml
index 33ba4f96f..14a12b997 100644
--- a/app/views/admin/epp_logs/index.haml
+++ b/app/views/admin/epp_logs/index.haml
@@ -46,6 +46,9 @@
   .col-md-12
     %hr
     = paginate @epp_logs
+    .pull-right
+      .pagination
+        = t(:result_count, count: @count) if @count > 0
     .table-responsive
       %table.table.table-hover.table-bordered.table-condensed
         %thead
@@ -69,3 +72,6 @@
 .row
   .col-md-12
     = paginate @epp_logs
+    .pull-right
+      .pagination
+        = t(:result_count, count: @count)
diff --git a/app/views/admin/invoices/index.haml b/app/views/admin/invoices/index.haml
index 903eaf819..336401b0d 100644
--- a/app/views/admin/invoices/index.haml
+++ b/app/views/admin/invoices/index.haml
@@ -1,6 +1,8 @@
 - content_for :actions do
   = link_to(t(:add), new_admin_invoice_path, class: 'btn btn-primary')
 = render 'shared/title', name: t(:invoices)
+= render 'application/pagination'
+
 .row
   .col-md-12
     .table-responsive
@@ -32,5 +34,8 @@
               - else
                 %td.text-danger= t(:unpaid)
 .row
-  .col-md-12
+  .col-md-6
     = paginate @invoices
+  .col-md-6.text-right
+    .pagination
+      = t(:result_count, count: @count)
diff --git a/app/views/admin/registrars/index.html.erb b/app/views/admin/registrars/index.html.erb
index e641f5294..ba1c06f6d 100644
--- a/app/views/admin/registrars/index.html.erb
+++ b/app/views/admin/registrars/index.html.erb
@@ -10,6 +10,8 @@
     </div>
 </div>
 
+<%= render 'application/pagination' %>
+
 <div class="row">
     <div class="col-md-12">
         <div class="table-responsive">
@@ -62,7 +64,12 @@
     </div>
 </div>
 <div class="row">
-    <div class="col-md-12">
+    <div class="col-md-6">
         <%= paginate @registrars %>
     </div>
+    <div class="col-md-6 text-right">
+        <div class="pagination">
+            <%= t(:result_count, count: @count) %>
+        </div>
+    </div>
 </div>
diff --git a/app/views/admin/repp_logs/index.haml b/app/views/admin/repp_logs/index.haml
index 14608f99f..8eb475af5 100644
--- a/app/views/admin/repp_logs/index.haml
+++ b/app/views/admin/repp_logs/index.haml
@@ -43,6 +43,10 @@
 %hr
 .row
   .col-md-12
+    = paginate @repp_logs
+    .pull-right
+      .pagination
+        = t(:result_count, count: @count) if @count > 0
     .table-responsive
       %table.table.table-hover.table-bordered.table-condensed
         %thead
@@ -66,3 +70,6 @@
 .row
   .col-md-12
     = paginate @repp_logs
+    .pull-right
+      .pagination
+        = t(:result_count, count: @count)
diff --git a/app/views/application/_pagination.html.erb b/app/views/application/_pagination.html.erb
new file mode 100644
index 000000000..328e57e4b
--- /dev/null
+++ b/app/views/application/_pagination.html.erb
@@ -0,0 +1,17 @@
+<%= search_form_for([:admin, @q], html: { class: 'form-horizontal', autocomplete: 'off' }) do |f| %>
+    <div class="pull-right">
+        <div class=".text-right">
+            <div class="form-inline">
+                <%= label_tag t(:results_per_page) %>
+                <%= text_field_tag :results_per_page, params[:results_per_page], class: 'form-control', placeholder: t(:results_per_page) %>
+                <button class="btn btn-primary" align="right">
+                    &nbsp;
+                    <span class="glyphicon glyphicon-ok push-right"></span>
+                    &nbsp;
+                </button>
+            </div>
+        </div>
+    </div>
+<% end %>
+
+<div class="row form-group"></div>

From 9f2f72b1463ca1b9e886bbdcd5d06de21294d85b Mon Sep 17 00:00:00 2001
From: dinsmol <dinar184@mail.ru>
Date: Thu, 29 Jul 2021 15:52:26 +0300
Subject: [PATCH 2/6] fixed validate error

---
 app/controllers/repp/v1/base_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/repp/v1/base_controller.rb b/app/controllers/repp/v1/base_controller.rb
index b9440d226..37d4b95be 100644
--- a/app/controllers/repp/v1/base_controller.rb
+++ b/app/controllers/repp/v1/base_controller.rb
@@ -120,7 +120,7 @@ module Repp
       end
 
       def validate_webclient_ca
-        return if webclient_request?
+        return unless webclient_request?
 
         request_name = request.env['HTTP_SSL_CLIENT_S_DN_CN']
         webclient_cn = ENV['webclient_cert_common_name'] || 'webclient'

From 0c2dc9f957f8277e8b93c609b1173af9e0d4be5b Mon Sep 17 00:00:00 2001
From: dinsmol <dinar184@mail.ru>
Date: Fri, 30 Jul 2021 14:30:02 +0300
Subject: [PATCH 3/6] codeclimate fix (api_users)

---
 app/controllers/admin/api_users_controller.rb | 7 +++++--
 app/views/admin/api_users/index.html.erb      | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/controllers/admin/api_users_controller.rb b/app/controllers/admin/api_users_controller.rb
index ccdd1c526..3ca70d543 100644
--- a/app/controllers/admin/api_users_controller.rb
+++ b/app/controllers/admin/api_users_controller.rb
@@ -5,8 +5,7 @@ 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?
+      api_users_paginate if params[:results_per_page].to_i.positive?
     end
 
     def new
@@ -58,5 +57,9 @@ module Admin
     def registrar
       Registrar.find(params[:registrar_id])
     end
+
+    def api_users_paginate
+      @api_users = @api_users.per(params[:results_per_page])
+    end
   end
 end
diff --git a/app/views/admin/api_users/index.html.erb b/app/views/admin/api_users/index.html.erb
index a622a06a2..b34b00a66 100644
--- a/app/views/admin/api_users/index.html.erb
+++ b/app/views/admin/api_users/index.html.erb
@@ -36,7 +36,7 @@
     </div>
     <div class="col-md-6 text-right">
         <div class="pagination">
-            <%= t(:result_count, count: @count) %>
+            <%= t(:result_count, count: @q.result.count) %>
         </div>
     </div>
 </div>

From ec1a48743c64e1f5694c4ef4779d5e1250dc3d48 Mon Sep 17 00:00:00 2001
From: dinsmol <dinar184@mail.ru>
Date: Fri, 30 Jul 2021 15:20:58 +0300
Subject: [PATCH 4/6] codeclimate fixes

---
 app/controllers/admin/admin_users_controller.rb     | 2 +-
 app/controllers/admin/api_users_controller.rb       | 6 +-----
 app/controllers/admin/bank_statements_controller.rb | 3 +--
 app/controllers/admin/base_controller.rb            | 4 ++++
 app/controllers/admin/epp_logs_controller.rb        | 2 +-
 app/controllers/admin/invoices_controller.rb        | 3 +--
 app/controllers/admin/registrars_controller.rb      | 3 +--
 app/controllers/admin/repp_logs_controller.rb       | 2 +-
 app/views/admin/dns/zones/index.html.erb            | 2 +-
 app/views/admin/invoices/index.haml                 | 2 +-
 app/views/admin/registrars/index.html.erb           | 2 +-
 11 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/app/controllers/admin/admin_users_controller.rb b/app/controllers/admin/admin_users_controller.rb
index f2e11674d..39a177342 100644
--- a/app/controllers/admin/admin_users_controller.rb
+++ b/app/controllers/admin/admin_users_controller.rb
@@ -7,7 +7,7 @@ module Admin
       @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?
+      @admin_users = @admin_users.per(params[:results_per_page]) if paginate?
     end
 
     def new
diff --git a/app/controllers/admin/api_users_controller.rb b/app/controllers/admin/api_users_controller.rb
index 3ca70d543..534dc4491 100644
--- a/app/controllers/admin/api_users_controller.rb
+++ b/app/controllers/admin/api_users_controller.rb
@@ -5,7 +5,7 @@ module Admin
     def index
       @q = ApiUser.includes(:registrar).search(params[:q])
       @api_users = @q.result.page(params[:page])
-      api_users_paginate if params[:results_per_page].to_i.positive?
+      @api_users = @api_users.per(params[:results_per_page]) if paginate?
     end
 
     def new
@@ -57,9 +57,5 @@ module Admin
     def registrar
       Registrar.find(params[:registrar_id])
     end
-
-    def api_users_paginate
-      @api_users = @api_users.per(params[:results_per_page])
-    end
   end
 end
diff --git a/app/controllers/admin/bank_statements_controller.rb b/app/controllers/admin/bank_statements_controller.rb
index ced157e4d..227af994b 100644
--- a/app/controllers/admin/bank_statements_controller.rb
+++ b/app/controllers/admin/bank_statements_controller.rb
@@ -8,8 +8,7 @@ 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?
+      @bank_statements = @bank_statements.per(params[:results_per_page]) if paginate?
     end
 
     def show
diff --git a/app/controllers/admin/base_controller.rb b/app/controllers/admin/base_controller.rb
index 1fec2a18f..b5e91f2ab 100644
--- a/app/controllers/admin/base_controller.rb
+++ b/app/controllers/admin/base_controller.rb
@@ -17,5 +17,9 @@ module Admin
     def user_for_paper_trail
       current_admin_user ? current_admin_user.id_role_username : 'anonymous'
     end
+
+    def paginate?
+      params[:results_per_page].to_i.positive?
+    end
   end
 end
diff --git a/app/controllers/admin/epp_logs_controller.rb b/app/controllers/admin/epp_logs_controller.rb
index 2d72c068c..1a7602b90 100644
--- a/app/controllers/admin/epp_logs_controller.rb
+++ b/app/controllers/admin/epp_logs_controller.rb
@@ -12,7 +12,7 @@ module Admin
       @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?
+      @epp_logs = @epp_logs.per(params[:results_per_page]) if paginate?
     end
 
     def show
diff --git a/app/controllers/admin/invoices_controller.rb b/app/controllers/admin/invoices_controller.rb
index 3129b0d8e..35b650c84 100644
--- a/app/controllers/admin/invoices_controller.rb
+++ b/app/controllers/admin/invoices_controller.rb
@@ -36,8 +36,7 @@ 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?
+      @invoices = @invoices.per(params[:results_per_page]) if paginate?
     end
 
     def show; end
diff --git a/app/controllers/admin/registrars_controller.rb b/app/controllers/admin/registrars_controller.rb
index 534d2f248..36a8f76dc 100644
--- a/app/controllers/admin/registrars_controller.rb
+++ b/app/controllers/admin/registrars_controller.rb
@@ -8,8 +8,7 @@ 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?
+      @registrars = @registrars.per(params[:results_per_page]) if paginate?
     end
 
     def new
diff --git a/app/controllers/admin/repp_logs_controller.rb b/app/controllers/admin/repp_logs_controller.rb
index e4e3c3481..0bbd15dbe 100644
--- a/app/controllers/admin/repp_logs_controller.rb
+++ b/app/controllers/admin/repp_logs_controller.rb
@@ -12,7 +12,7 @@ module Admin
       @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?
+      @repp_logs = @repp_logs.per(params[:results_per_page]) if paginate?
     end
 
     def show
diff --git a/app/views/admin/dns/zones/index.html.erb b/app/views/admin/dns/zones/index.html.erb
index 1068f3c7b..05554ceff 100644
--- a/app/views/admin/dns/zones/index.html.erb
+++ b/app/views/admin/dns/zones/index.html.erb
@@ -33,7 +33,7 @@
     </div>
     <div class="col-md-6 text-right">
         <div class="pagination">
-            <%= t(:result_count, count: @count) %>
+            <%= t(:result_count, count: @q.result.count) %>
         </div>
     </div>
 </div>
diff --git a/app/views/admin/invoices/index.haml b/app/views/admin/invoices/index.haml
index 336401b0d..ede0b5c3c 100644
--- a/app/views/admin/invoices/index.haml
+++ b/app/views/admin/invoices/index.haml
@@ -38,4 +38,4 @@
     = paginate @invoices
   .col-md-6.text-right
     .pagination
-      = t(:result_count, count: @count)
+      = t(:result_count, count: @q.result.count)
diff --git a/app/views/admin/registrars/index.html.erb b/app/views/admin/registrars/index.html.erb
index ba1c06f6d..7095fd0ef 100644
--- a/app/views/admin/registrars/index.html.erb
+++ b/app/views/admin/registrars/index.html.erb
@@ -69,7 +69,7 @@
     </div>
     <div class="col-md-6 text-right">
         <div class="pagination">
-            <%= t(:result_count, count: @count) %>
+            <%= t(:result_count, count: @q.result.count) %>
         </div>
     </div>
 </div>

From 8108f96042c1b28c35f1ff771293670ce19844a7 Mon Sep 17 00:00:00 2001
From: dinsmol <dinar184@mail.ru>
Date: Fri, 30 Jul 2021 16:44:45 +0300
Subject: [PATCH 5/6] fixed brakeman errors

---
 app/views/admin/api_users/index.html.erb | 2 +-
 app/views/admin/dns/zones/index.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/admin/api_users/index.html.erb b/app/views/admin/api_users/index.html.erb
index b34b00a66..40e620954 100644
--- a/app/views/admin/api_users/index.html.erb
+++ b/app/views/admin/api_users/index.html.erb
@@ -23,7 +23,7 @@
                 </thead>
 
                 <tbody>
-                    <%= render @api_users %>
+                    <%= render partial: 'api_user', collection: @api_users %>
                 </tbody>
             </table>
         </div>
diff --git a/app/views/admin/dns/zones/index.html.erb b/app/views/admin/dns/zones/index.html.erb
index 05554ceff..5624c5889 100644
--- a/app/views/admin/dns/zones/index.html.erb
+++ b/app/views/admin/dns/zones/index.html.erb
@@ -21,7 +21,7 @@
         </thead>
 
         <tbody>
-            <%= render @zones %>
+            <%= render partial: 'zone', collection: @zones %>
         </tbody>
     </table>
 <% else %>

From f125a49501660a33c4d7ac3c8e2ed8cf5d1a90e6 Mon Sep 17 00:00:00 2001
From: dinsmol <dinar184@mail.ru>
Date: Tue, 3 Aug 2021 12:19:07 +0300
Subject: [PATCH 6/6] fixed bank statements page

---
 app/views/admin/bank_statements/index.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/admin/bank_statements/index.haml b/app/views/admin/bank_statements/index.haml
index a9d9cfa53..6aabb0891 100644
--- a/app/views/admin/bank_statements/index.haml
+++ b/app/views/admin/bank_statements/index.haml
@@ -33,4 +33,4 @@
     = paginate @bank_statements
   .col-md-6.text-right
     .pagination
-      = t(:result_count, count: @count)
+      = t(:result_count, count: @q.result.count)