fix issues

This commit is contained in:
olegphenomenon 2022-04-22 14:04:29 +03:00
parent 9766650ae4
commit 3b9ff74bd2
7 changed files with 66 additions and 14 deletions

View file

@ -41,11 +41,11 @@
 
</button>
<div style="margin-right: 10px;">
<%= link_to(t('.reset_btn'), admin_auctions_path, class: 'btn btn-default') %>
<%= link_to('Clear', admin_auctions_path, class: 'btn btn-default') %>
</div>
<div style="margin-right: 10px;">
<%= link_to 'Download auction list', admin_auctions_path(format: :csv, params: params.permit!),
"data-toggle" => "tooltip", "data-placement" => "bottom", "title" => t('.download_csv_btn'),
"data-toggle" => "tooltip", "data-placement" => "bottom", "title" => 'Download CSV',
class: 'btn btn-primary' %>
</div>
<div >
@ -114,10 +114,12 @@
<th class="col-xs-2">
<%= sort_link(@q, 'registration_deadline') %>
</th>
<th class="col-xs-2">
<th class="col-xs-1">
<%= sort_link(@q, 'type') %>
</th>
<th class="col-xs-3">
Action
</th>
</tr>
</thead>
@ -130,6 +132,11 @@
<td><%= auction.registration_code %></td>
<td><%= auction.registration_deadline %></td>
<td><%= auction.platform %></td>
<td>
<%= button_tag type: 'button', data: { confirm: "Are you sure?" }, class: 'btn btn-primary' do %>
<% link_to 'Send to auction', send_to_auction_admin_auction_path(auction), method: :post, style: "color: white;" %>
<% end %>
</td>
</tr>
<% end %>
</tbody>
@ -138,6 +145,17 @@
</div>
</div>
<div class="row">
<div class="col-md-6">
<%= paginate @auctions %>
</div>
<div class="col-md-6 text-right">
<div class="pagination">
<%= t(:result_count, count: @auctions.total_count) %>
</div>
</div>
</div>
<script>
$('#user-form-edit').on("show.bs.modal", function(e) {
$(this).find('.modal-body').load(e.relatedTarget.dataset.url);

View file

@ -21,7 +21,6 @@
%li= link_to t('.prices'), admin_prices_path
%li= link_to t(:bank_statements), admin_bank_statements_path
%li= link_to t(:invoices), admin_invoices_path
%li= link_to t(:auctions), admin_auctions_path
%li= link_to t(:accounts), admin_accounts_path
%li= link_to t(:account_activities), admin_account_activities_path(created_after: 'today')
%li.divider
@ -32,6 +31,7 @@
%li.dropdown-header= t(:system)
%li= link_to t('.settings'), admin_settings_path
%li= link_to t('.zones'), admin_zones_path
%li= link_to t(:auctions), admin_auctions_path
%li= link_to t('.blocked_domains'), admin_blocked_domains_path
%li= link_to t('.reserved_domains'), admin_reserved_domains_path
%li= link_to t('.disputed_domains'), admin_disputes_path