app/views/bulkrax/importers/show.html.erb in bulkrax-6.0.1 vs app/views/bulkrax/importers/show.html.erb in bulkrax-7.0.0

- old
+ new

@@ -1,11 +1,12 @@ <div class="col-xs-12 main-header"> <h1><span class="fa fa-cloud-upload" aria-hidden="true"></span> Importer: <%= @importer.name %></h1> - <% if @importer.parser_klass == 'Bulkrax::CsvParser' && @work_entries.map(&:failed?).any? %> + + <% if @importer.failed_entries? %> <div class="pull-right"> - <%= link_to 'Export Errored Entries', importer_export_errors_path(@importer.id), class: 'btn btn-primary' %> - <%= link_to 'Upload Corrected Entries', importer_upload_corrected_entries_path(@importer.id), class: 'btn btn-primary' %> + <%= link_to 'Export Errored Entries', importer_export_errors_path(@importer.id), class: 'btn btn-primary', data: { turbolinks: false }%> + <%= link_to 'Upload Corrected Entries', importer_upload_corrected_entries_path(@importer.id), class: 'btn btn-primary' if @importer.parser.is_a?(Bulkrax::CsvParser) %> </div> <% end %> </div> <div class="panel panel-default bulkrax-align-text"> <div class="panel-body"> @@ -73,20 +74,13 @@ <%= @importer.last_run&.total_file_set_entries %> </p> <div class="bulkrax-nav-tab-bottom-margin"> <!-- Nav tabs --> - <ul class="bulkrax-nav-tab-top-margin tab-nav nav nav-tabs" role="tablist"> - <li role="presentation" class="nav-link active"><a href="#work-entries" aria-controls="work-entries" role="tab" data-toggle="tab"><%= t('bulkrax.importer.labels.work_entries') %></a></li> - <li role="presentation" class="nav-link"><a href="#collection-entries" aria-controls="collection-entries" role="tab" data-toggle="tab"><%= t('bulkrax.importer.labels.collection_entries') %></a></li> - <li role="presentation" class="nav-link"><a href="#file-set-entries" aria-controls="file-set-entries" role="tab" data-toggle="tab"><%= t('bulkrax.importer.labels.file_set_entries') %></a></li> - </ul> - <!-- Tab panes --> - <div class="tab-content outline"> - <%= render partial: 'bulkrax/shared/work_entries_tab', locals: { item: @importer, entries: @work_entries } %> - <%= render partial: 'bulkrax/shared/collection_entries_tab', locals: { item: @importer, entries: @collection_entries } %> - <%= render partial: 'bulkrax/shared/file_set_entries_tab', locals: { item: @importer, entries: @file_set_entries } %> + <div class="outline"> + <%= render partial: 'bulkrax/shared/entries_tab', locals: { item: @importer} %> </div> + <%= render partial: 'bulkrax/importers/edit_item_buttons', locals: { item: @importer, e: @first_entry } if @first_entry.present? %> </div> <p class="bulkrax-p-align"> <%= link_to 'Edit', edit_importer_path(@importer) %> |