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

fixed form and test

Browse source
This commit is contained in:
dinsmol 2021-08-08 23:17:56 +03:00
parent 20ea2ef373
commit 48d5e4de4a
3 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/controllers/admin/domain_versions_controller.rb
View file

@ -16,9 +16,9 @@ module Admin
search_params.delete(:registrant) search_params.delete(:registrant)
end end
if search_params[:whodunnit].present? if search_params[:registrar].present?
registrars = Registrar.where("name ilike ?", "%#{search_params[:whodunnit].strip}%") registrars = Registrar.where("name ilike ?", "%#{search_params[:registrar].strip}%")
search_params.delete(:whodunnit) search_params.delete(:registrar)
end end
whereS = "1=1" whereS = "1=1"
@ -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

2
app/views/admin/domain_versions/archive.haml
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.select :whodunnit, Registrar.all.map { |x| [x, x.name] }, { include_blank: true }, 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

2
test/system/admin_area/domain_versions_test.rb
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,