Merge pull request #2068 from internetee/2065-admin-dropdown-filter-list-registrar-name

updated registrar name field in domain admin view
This commit is contained in:
Timo Võhmar 2021-07-06 13:24:11 +03:00 committed by GitHub
commit 3944698c59
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 75 additions and 75 deletions

View file

@ -19,7 +19,7 @@
.col-md-3
.form-group
= label_tag t(:ident_type)
= select_tag '[q][ident_type_eq]', options_for_select(ident_types, params[:q][:ident_type_eq]), { include_blank: true, placeholder: t(:choose), class: 'form-control selectize' }
= select_tag '[q][ident_type_eq]', options_for_select(ident_types, params[:q][:ident_type_eq]), { placeholder: t(:choose), multiple: true, class: 'form-control js-combobox' }
.row
.col-md-3
.form-group
@ -28,7 +28,7 @@
.col-md-3
.form-group
= label_tag t(:country)
= select_tag '[q][country_code_eq]', ApplicationController.helpers.all_country_options(params[:q][:country_code_eq]), { include_blank: true, placeholder: t(:choose), class: 'form-control selectize' }
= select_tag '[q][country_code_eq]', options_for_select(ApplicationController.helpers.all_country_options(params[:q][:country_code_eq]), params[:q][:country_code_eq]), { include_blank: true, placeholder: t(:choose), class: 'form-control' }
.col-md-6
.form-group
= label_tag t(:contact_type)
@ -37,7 +37,7 @@
.col-md-3
.form-group
= f.label t(:registrar_name)
= f.select :registrar_id_eq, Registrar.all.map { |x| [x, x.id] }, { include_blank: true }, class: 'form-control selectize', placeholder: t(:choose)
= f.select :registrar_id_eq, Registrar.all.map { |x| [x, x.id] }, { include_blank: true }, class: 'form-control', placeholder: t(:choose)
.col-md-3
.form-group
= f.label t(:created_at_from)

View file

@ -1,74 +1,74 @@
<%= search_form_for [:admin, @q], html: { class: 'search-form', autocomplete: 'off' } do |f| %>
<div class="row">
<div class="col-md-3">
<div class="form-group">
<%= f.label :name, for: nil %>
<%= f.search_field :name_matches, value: params[:q][:name_matches], class: 'form-control', placeholder: t(:name) %>
</div>
</div>
<div class="col-md-2">
<div class="form-group">
<%= f.label :registrant_ident, for: nil %>
<%= f.search_field :registrant_ident_eq, class: 'form-control', placeholder: t(:registrant_ident) %>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<%= f.label :contact_ident, for: nil %>
<%= f.search_field :contacts_ident_eq, class: 'form-control', placeholder: t(:contact_ident) %>
</div>
</div>
<div class="col-md-4">
<div class="form-group">
<%= f.label :nameserver_hostname, for: nil %>
<%= f.search_field :nameservers_hostname_eq, class: 'form-control', placeholder: t(:nameserver_hostname) %>
</div>
</div>
<div class="row">
<div class="col-md-3">
<div class="form-group">
<%= f.label :name, for: nil %>
<%= f.search_field :name_matches, value: params[:q][:name_matches], class: 'form-control', placeholder: t(:name) %>
</div>
<div class="row">
<div class="col-md-5">
<div class="form-group">
<%= f.label :registrar_name, for: nil %>
<%= f.select :registrar_id_eq, Registrar.all.map { |x| [x, x.id] }, { include_blank: true }, class: 'form-control selectize' %>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<%= f.label :valid_to_from, for: nil %>
<%= f.search_field :valid_to_gteq, value: params[:q][:valid_to_gteq], class: 'form-control js-datepicker', placeholder: t(:valid_to_from) %>
</div>
</div>
<div class="col-md-4">
<div class="form-group">
<%= f.label :valid_to_until, for: nil %>
<%= f.search_field :valid_to_lteq, value: params[:q][:valid_to_lteq], class: 'form-control js-datepicker', placeholder: t(:valid_to_until) %>
</div>
</div>
</div>
<div class="col-md-2">
<div class="form-group">
<%= f.label :registrant_ident, for: nil %>
<%= f.search_field :registrant_ident_eq, class: 'form-control', placeholder: t(:registrant_ident) %>
</div>
<div class="row">
<div class="col-md-5">
<div class="form-group">
<%= label_tag :status, nil, for: nil %>
<%= select_tag :statuses_contains, options_for_select(DomainStatus::STATUSES, params[:statuses_contains]), { multiple: true, class: 'form-control js-combobox' } %>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<%= label_tag :results_per_page, nil, for: nil %>
<%= text_field_tag :results_per_page, params[:results_per_page], class: 'form-control', placeholder: t(:results_per_page) %>
</div>
</div>
<div class="col-md-4 actions">
<button class="btn btn-primary">
&nbsp;
<span class="glyphicon glyphicon-search"></span>
&nbsp;
</button>
<%= link_to t('.download_csv_btn'), admin_domains_path(format: :csv, params: params.permit!),
</div>
<div class="col-md-3">
<div class="form-group">
<%= f.label :contact_ident, for: nil %>
<%= f.search_field :contacts_ident_eq, class: 'form-control', placeholder: t(:contact_ident) %>
</div>
</div>
<div class="col-md-4">
<div class="form-group">
<%= f.label :nameserver_hostname, for: nil %>
<%= f.search_field :nameservers_hostname_eq, class: 'form-control', placeholder: t(:nameserver_hostname) %>
</div>
</div>
</div>
<div class="row">
<div class="col-md-5">
<div class="form-group">
<%= f.label :registrar_name, for: nil %>
<%= select_tag 'q[registrar_id_eq]', options_for_select(Registrar.all.map { |x| [x, x.id] }, params[:q][:registrar_id_eq]), { include_blank:true, class: 'form-control' } %>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<%= f.label :valid_to_from, for: nil %>
<%= f.search_field :valid_to_gteq, value: params[:q][:valid_to_gteq], class: 'form-control js-datepicker', placeholder: t(:valid_to_from) %>
</div>
</div>
<div class="col-md-4">
<div class="form-group">
<%= f.label :valid_to_until, for: nil %>
<%= f.search_field :valid_to_lteq, value: params[:q][:valid_to_lteq], class: 'form-control js-datepicker', placeholder: t(:valid_to_until) %>
</div>
</div>
</div>
<div class="row">
<div class="col-md-5">
<div class="form-group">
<%= label_tag :status, nil, for: nil %>
<%= select_tag :statuses_contains, options_for_select(DomainStatus::STATUSES, params[:statuses_contains]), { multiple: true, class: 'form-control js-combobox' } %>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<%= label_tag :results_per_page, nil, for: nil %>
<%= text_field_tag :results_per_page, params[:results_per_page], class: 'form-control', placeholder: t(:results_per_page) %>
</div>
</div>
<div class="col-md-4 actions">
<button class="btn btn-primary">
&nbsp;
<span class="glyphicon glyphicon-search"></span>
&nbsp;
</button>
<%= link_to t('.download_csv_btn'), admin_domains_path(format: :csv, params: params.permit!),
"data-toggle" => "tooltip", "data-placement" => "bottom", "title" => t('.download_csv_btn'),
class: 'btn btn-default' %>
<%= link_to t('.reset_btn'), admin_domains_path, class: 'btn btn-default' %>
<%= link_to t('.reset_btn'), admin_domains_path, class: 'btn btn-default' %>
</div>
</div>
</div>
</div>
<% end %>

View file

@ -8,17 +8,17 @@
.col-md-3
.form-group
= f.label :request_command
= f.select :request_command_eq, [[t(:choose),''], 'hello', 'login', 'logout', 'info', 'create', 'update', 'delete', 'check', 'renew', 'transfer', 'poll'], {}, class: 'form-control selectize', placeholder: t(:choose)
= f.select :request_command_eq, [[t(:choose),''], 'hello', 'login', 'logout', 'info', 'create', 'update', 'delete', 'check', 'renew', 'transfer', 'poll'], {}, class: 'form-control js-combobox', placeholder: t(:choose)
.col-md-3
.form-group
- opts = [[t(:choose),''], 'contact', 'domain', 'poll']
- opts += [params[:q][:request_object_cont]] if params[:q].present? && params[:q][:request_object_cont].present?
= f.label :request_object
= f.select :request_object_cont, opts, {}, class: 'form-control selectize_create', placeholder: t(:choose)
= f.select :request_object_cont, opts, {}, class: 'form-control js-combobox', placeholder: t(:choose)
.col-md-3
.form-group
= f.label :request_successful
= f.select :request_successful_true, [[t(:choose), ''], 'true', 'false'], {}, class: 'form-control selectize', placeholder: t(:choose)
= f.select :request_successful_true, [[t(:choose), ''], 'true', 'false'], {}, class: 'form-control js-combobox', placeholder: t(:choose)
.col-md-3
.form-group
= f.label :api_user

View file

@ -8,11 +8,11 @@
.col-md-3
.form-group
= f.label :request_path
= f.select :request_path_eq, [[t(:choose),''], '/repp/v1/domains', '/repp/v1/contacts'], {}, class: 'form-control selectize', placeholder: t(:choose)
= f.select :request_path_eq, [[t(:choose),''], '/repp/v1/domains', '/repp/v1/contacts'], {}, class: 'form-control js-combobox', placeholder: t(:choose)
.col-md-3
.form-group
= f.label :request_method
= f.select :request_method_eq, [[t(:choose),''], 'GET', 'POST', 'PUT', 'DELETE'], {}, class: 'form-control selectize', placeholder: t(:choose)
= f.select :request_method_eq, [[t(:choose),''], 'GET', 'POST', 'PUT', 'DELETE'], {}, class: 'form-control js-combobox', placeholder: t(:choose)
.col-md-3
.form-group
= f.label :response_code