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

codeclimate fixes

Browse source
This commit is contained in:
dinsmol 2021-07-30 15:20:58 +03:00
parent 0c2dc9f957
commit ec1a48743c
11 changed files with 14 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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

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

@ -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

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

@ -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

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

@ -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

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

@ -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

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

@ -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

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

@ -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

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

@ -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

2
app/views/admin/dns/zones/index.html.erb
View file

@ -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>

2
app/views/admin/invoices/index.haml
View file

@ -38,4 +38,4 @@
= paginate @invoices
.col-md-6.text-right
.pagination
= t(:result_count, count: @count)
= t(:result_count, count: @q.result.count)

2
app/views/admin/registrars/index.html.erb
View file

@ -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>