diff --git a/app/controllers/admin/domains_controller.rb b/app/controllers/admin/domains_controller.rb index 3acef467f..163102c14 100644 --- a/app/controllers/admin/domains_controller.rb +++ b/app/controllers/admin/domains_controller.rb @@ -26,6 +26,8 @@ class Admin::DomainsController < AdminController params[:q][:name_matches] = n_cache # we don't want to show wildcards in search form end end + + @domains = @domains.per(params[:results_per_page]) if params[:results_per_page].to_i > 0 end def show diff --git a/app/views/admin/domains/index.haml b/app/views/admin/domains/index.haml index 94d8d82c2..8a3cc5808 100644 --- a/app/views/admin/domains/index.haml +++ b/app/views/admin/domains/index.haml @@ -34,10 +34,14 @@ = f.label t(:valid_to_until) = f.search_field :valid_to_lteq, value: params[:q][:valid_to_lteq], class: 'form-control datepicker', placeholder: t(:valid_to_until) .row - .col-md-9 + .col-md-6 .form-group = label_tag t(:status) = select_tag 'q[statuses_contains]', options_for_select(DomainStatus::STATUSES, params[:q][:statuses_contains]), { multiple: true, placeholder: t(:choose), class: 'form-control js-combobox' } + .col-md-3 + .form-group + = label_tag t(:results_per_page) + = text_field_tag :results_per_page, params[:results_per_page], class: 'form-control', placeholder: t(:results_per_page) .col-md-3{style: 'padding-top: 25px;'} %button.btn.btn-primary   diff --git a/config/locales/en.yml b/config/locales/en.yml index 1027ec68c..87a3946ba 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -890,3 +890,4 @@ en: valid_to_until: 'Valid to until' registrant_ident: 'Registrant ident' contact_ident: 'Contact ident' + results_per_page: 'Results per page'