scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-13 08:34:49 +08:00
Code Issues Projects Releases Packages Wiki Activity

Perserve save filters button on toolbar reload [SCI-6553] (#3874)

Browse source
This commit is contained in:
artoscinote 2022-02-21 10:09:59 +01:00 • committed by GitHub
parent 0267bade3c
commit cce6a17e8f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/repositories/repository_datatable.js
View file

@ -263,9 +263,13 @@ var RepositoryDatatable = (function(global) {
}
function resetTableView() {
var filterSaveButtonVisible = !$('#saveRepositoryFilters').hasClass('hidden');
$.getJSON($(TABLE_ID).data('toolbar-url'), (data) => {
$('#toolbarButtonsDatatable').remove();
$(data.html).appendTo('div.toolbar');
if (filterSaveButtonVisible) {
$('#saveRepositoryFilters').removeClass('hidden');
}
if (typeof initBMTFilter === 'function') initBMTFilter();
});

62
app/views/repositories/_toolbar_buttons.html.erb
View file

@ -13,36 +13,6 @@
<span class="hidden-xs"><%= t("repositories.add_new_record") %></span>
</button>
<% end %>
<% if can_manage_repository_filters?(@repository) %>
<div class="repository-cog dropdown hidden" id="saveRepositoryFilters">
<button type="button"
class="btn btn-default"
data-toggle="dropdown"
aria-haspopup="true"
aria-expanded="true">
<span class="fas fa-save"></span>
<span class="hidden-xs"><%= t("repositories.show.filters.save_filters") %></span>
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li id="newFilterLink" data-view-mode="active">
<a href="#" data-toggle="modal" data-target="#modalSaveRepositoryTableFilter">
<span class="fas fa-plus"></span>
<%= t('repositories.show.filters.new_filter') %>
</a>
</li>
<li id="overwriteFilterLink" class="hidden" data-view-mode="active">
<a href="#" data-toggle="modal" class="overwrite-link" data-target="#modalSaveRepositoryTableFilter">
<span class="fas fa-save"></span>
<span class="overwrite-title">
<%= t('repositories.show.filters.overwrite_filter') %>
<span id="currentFilterName"></span>
</span>
</a>
</li>
</ul>
</div>
<% end %>
<% if can_manage_repository_rows?(@repository) %>
<span id="editDeleteCopy" data-toggle="buttons" style="display:none">
@ -115,6 +85,38 @@
</table>
<% end %>
</div>
<% if can_manage_repository_filters?(@repository) %>
<div class="repository-cog dropdown hidden" id="saveRepositoryFilters">
<button type="button"
class="btn btn-default"
data-toggle="dropdown"
aria-haspopup="true"
aria-expanded="true">
<span class="fas fa-save"></span>
<span class="hidden-xs"><%= t("repositories.show.filters.save_filters") %></span>
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li id="newFilterLink" data-view-mode="active">
<a href="#" data-toggle="modal" data-target="#modalSaveRepositoryTableFilter">
<span class="fas fa-plus"></span>
<%= t('repositories.show.filters.new_filter') %>
</a>
</li>
<li id="overwriteFilterLink" class="hidden" data-view-mode="active">
<a href="#" data-toggle="modal" class="overwrite-link" data-target="#modalSaveRepositoryTableFilter">
<span class="fas fa-save"></span>
<span class="overwrite-title">
<%= t('repositories.show.filters.overwrite_filter') %>
<span id="currentFilterName"></span>
</span>
</a>
</li>
</ul>
</div>
<% end %>
<% if @repository.is_a?(BmtRepository) %>
<div class="dropdown" id="bmtFiltersDropdownButton">
<button id="bmtFiltersDropdown"