Use resourceful routes

https://github.com/rails/rails/pull/23980
This commit is contained in:
Artur Beljajev 2019-10-12 17:06:35 +03:00
parent f8765eca4d
commit 199085f8ac
15 changed files with 152 additions and 113 deletions

View file

@ -18,7 +18,7 @@
%th{class: 'col-xs-2'}
=t(:registrar_name)
%tbody
- @domains.result.each do |x|
- @domains.each do |x|
%tr
%td= x.name
%td= x.registrant

View file

@ -18,6 +18,13 @@
<%= f.search_field :registrant_ident_eq, class: 'form-control', placeholder: t(:registrant_ident) %>
</div>
</div>
<div class="col-md-3">
<div class="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) %>
</div>
</div>
</div>
<div class="row">
<div class="col-md-3">
@ -32,43 +39,27 @@
<%= 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 class="col-md-3">
<div class="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) %>
</div>
</div>
</div>
<div class="col-md-3 actions">
<button class="btn btn-primary">
<div class="row">
<div class="col-md-12 text-right">
<button class="btn btn-primary search">
&nbsp;
<span class="glyphicon glyphicon-search"></span>
&nbsp;
</button>
<%= link_to(t('.reset_btn'), registrant_domains_path, class: 'btn btn-default') %>
<%= button_tag t('.download_pdf_btn'),
formaction: registrant_domains_path(format: :pdf),
name: nil,
class: 'btn btn-default' %>
<%= button_tag t('.download_csv_btn'),
formaction: registrant_domains_path(format: :csv),
name: nil,
class: 'btn btn-default' %>
<%= link_to t('.reset_btn'), registrant_domains_path,
class: 'btn btn-default' %>
</div>
</div>
<div class="row">
<div class="col-md-3">
<div class="btn-group" role="group">
<button aria-expanded="false" aria-haspopup="true" class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button">
Download
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li>
<%= link_to 'PDF', download_list_registrant_domains_path(q: params[:q], format: "pdf") %>
</li>
<li>
<%= link_to 'CSV', download_list_registrant_domains_path(q: params[:q], format: "csv") %>
</li>
</ul>
</div>
</div>
<div class="col-md-3"></div>
<div class="col-md-3"></div>
<div class="col-md-3"></div>
</div>
<% end %>
</div>
</div>

View file

@ -83,49 +83,35 @@
</div>
<div class="row">
<div class="col-md-6">
<div class="col-md-5">
<div class="form-group">
<%= label_tag t(:status) %>
<%= select_tag :statuses_contains, options_for_select(Contact::STATUSES, params[:statuses_contains]), { multiple: true, placeholder: t(:choose), class: 'form-control js-combobox' } %>
</div>
</div>
<div class="col-md-3">
<div class="col-md-2">
<div class="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) %>
</div>
</div>
<div class="col-md-3" style="padding-top: 25px;">
<div class="col-md-5 text-right" style="padding-top: 25px;">
<button class="btn btn-primary">
&nbsp;
<span class="glyphicon glyphicon-search"></span>
&nbsp;
</button>
<%= button_tag t('.download_pdf_btn'),
formaction: registrar_contacts_path(format: :pdf),
name: nil,
class: 'btn btn-default' %>
<%= button_tag t('.download_csv_btn'),
formaction: registrar_contacts_path(format: :csv),
name: nil,
class: 'btn btn-default' %>
<%= link_to(t('.reset_btn'), registrar_contacts_path, class: 'btn btn-default') %>
</div>
</div>
<div class="row">
<div class="col-md-3">
<div class="btn-group" role="group">
<button aria-expanded="false" aria-haspopup="true" class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button">
Download
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li>
<%= link_to 'PDF', download_list_registrar_contacts_path(q: params[:q], format: "pdf") %>
</li>
<li>
<%= link_to 'CSV', download_list_registrar_contacts_path(q: params[:q], format: "csv") %>
</li>
</ul>
</div>
</div>
<div class="col-md-3"></div>
<div class="col-md-3"></div>
<div class="col-md-3"></div>
</div>
<% end %>

View file

@ -74,14 +74,14 @@
</div>
</div>
<div class="col-md-offset-6 col-md-4 text-right">
<div class="col-md-10 text-right">
<button class="btn btn-primary search">
&nbsp;
<span class="glyphicon glyphicon-search"></span>
&nbsp;
</button>
<%= button_tag t('.download_btn'), class: 'btn btn-primary export-domains-csv-btn',
formaction: registrar_domains_path(format: 'csv') %>
<%= button_tag t('.download_btn'), formaction: registrar_domains_path(format: 'csv'),
class: 'btn btn-default' %>
<%= link_to t('.reset_btn'), registrar_domains_path, class: 'btn btn-default' %>
</div>
</div>