zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-06-13 16:14:47 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix domain filtering in csv download

Browse source
This commit is contained in:
Alex Sherman 2021-01-25 19:45:47 +05:00
parent 4b388cc671
commit d39b346a84
4 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.codeclimate.yml
View file

@ -7,6 +7,9 @@ prepare:
plugins: plugins:
brakeman: brakeman:
enabled: true enabled: true
checks:
mass_assign_permit!:
enabled: false
bundler-audit: bundler-audit:
enabled: true enabled: true
duplication: duplication:

21
app/views/admin/domains/_search_form.html.erb
View file

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

2
config/locales/admin/domains.en.yml
View file

@ -11,7 +11,7 @@ en:
search_form: search_form:
reset_btn: Reset reset_btn: Reset
download_csv_btn: "Download CSV" download_csv_btn: CSV
form: form:
pending_delete: &pending_delete pending_delete: &pending_delete

2
test/system/admin_area/domains/csv_test.rb
View file

@ -11,7 +11,7 @@ class AdminAreaCsvTest < ApplicationSystemTestCase
travel_to Time.zone.parse('2010-07-05 10:30') travel_to Time.zone.parse('2010-07-05 10:30')
visit admin_domains_url visit admin_domains_url
click_link(class: 'glyphicon glyphicon-list-alt') click_link('CSV')
assert_equal "attachment; filename=\"domains.csv\"; filename*=UTF-8''domains.csv", response_headers['Content-Disposition'] assert_equal "attachment; filename=\"domains.csv\"; filename*=UTF-8''domains.csv", response_headers['Content-Disposition']
assert_equal expected_csv, page.body assert_equal expected_csv, page.body
end end