Merge pull request #2115 from internetee/501-registrar-name-dropdown

Admin: dropdown for registrar fields
This commit is contained in:
Timo Võhmar 2021-08-11 12:33:21 +03:00 committed by GitHub
commit 3dd0b654dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 5 deletions

View file

@ -45,7 +45,6 @@ module Admin
@versions = @q.result.page(params[:page]) @versions = @q.result.page(params[:page])
@versions = @versions.per(params[:results_per_page]) if params[:results_per_page].to_i.positive? @versions = @versions.per(params[:results_per_page]) if params[:results_per_page].to_i.positive?
render "admin/domain_versions/archive" render "admin/domain_versions/archive"
end end
def show def show

View file

@ -15,7 +15,7 @@
.col-md-3 .col-md-3
.form-group .form-group
= label_tag t(:registrar_name) = label_tag t(:registrar_name)
= f.search_field :registrar, value: params[:q][:registrar], class: 'form-control', placeholder: t('.registrant') = select_tag '[q][registrar]', options_for_select(Registrar.all.map { |x| [x, x.name] }, selected: params[:q][:registrar]), { include_blank: true, class: 'form-control', placeholder: t('.registrant')}
.col-md-3 .col-md-3
.form-group .form-group
= label_tag :action = label_tag :action

View file

@ -27,7 +27,7 @@
.col-md-3 .col-md-3
.form-group .form-group
= f.label :registrar = f.label :registrar
= f.search_field :api_user_registrar_cont, class: 'form-control', placeholder: t(:registrar_name), autocomplete: 'off' = f.select :api_user_registrar_cont, Registrar.all.map { |x| [x, x.name] }, { include_blank: true }, class: 'form-control', placeholder: t(:choose)
.col-md-3 .col-md-3
.form-group .form-group
= f.label t(:created_after) = f.label t(:created_after)

View file

@ -25,7 +25,8 @@
.col-md-3 .col-md-3
.form-group .form-group
= f.label :registrar = f.label :registrar
= f.search_field :api_user_registrar_cont, class: 'form-control', placeholder: t(:registrar_name), autocomplete: 'off' = f.select :api_user_registrar_cont, Registrar.all.map { |x| [x, x.name] }, { include_blank: true }, class: 'form-control', placeholder: t(:choose)
-# = f.search_field :api_user_registrar_cont, class: 'form-control', placeholder: t(:registrar_name), autocomplete: 'off'
.col-md-3 .col-md-3
.form-group .form-group
= f.label t(:created_after) = f.label t(:created_after)

View file

@ -72,7 +72,7 @@ class DomainVersionsTest < ApplicationSystemTestCase
def test_search_registrar_param def test_search_registrar_param
visit admin_domain_versions_path visit admin_domain_versions_path
find('#q_registrar').set(@domain.registrar) find('#_q_registrar').find(:option, @domain.registrar).select_option
find('.btn.btn-primary').click find('.btn.btn-primary').click
assert_equal current_url, assert_equal current_url,