scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 07:26:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4641 from G-Chubinidze/gc_SCI_7492

Browse source 
Missing navigate away pop up at inventory page [SCI-7492]
This commit is contained in:
artoscinote 2022-11-23 14:14:35 +01:00 committed by GitHub
parent 5b291acc27 f78cf58552
commit 7d53027530
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 6 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

@ -90,6 +90,8 @@ var RepositoryDatatable = (function(global) {
$('#editDeleteCopy').show();
$('#toolbarPrintLabel').show();
}
$('#team-switch').css({ 'pointer-events': 'auto', opacity: 1 });
$('#navigationGoBtn').prop('disabled', false);
} else if (currentMode === 'editMode') {
$(TABLE_WRAPPER_ID).addClass('editing');
$('.repository-save-changes-link').on('click', function() {
@ -119,6 +121,8 @@ var RepositoryDatatable = (function(global) {
$('.dataTables_filter input').prop('disabled', true);
$('#toolbarPrintLabel').hide();
$('.repository-edit-overlay').show();
$('#team-switch').css({ 'pointer-events': 'none', opacity: 0.6 });
$('#navigationGoBtn').prop('disabled', true);
}
}

3
app/views/shared/_left_menu_bar.html.erb
View file

@ -52,8 +52,7 @@
<% end %>
</li>
<li class="<%= "active" if templates_are_selected? %>">
<%= link_to protocols_path, id: "templates-link", title: t('left_menu_bar.templates'),
data: { turbolinks: false } do %>
<%= link_to protocols_path, id: "templates-link", title: t('left_menu_bar.templates') do %>
<span class="fas fa-edit"></span>
<span><%= t('left_menu_bar.templates') %></span>
<% end %>

5
app/views/shared/_navigation.html.erb
View file

@ -81,8 +81,7 @@
<li class="team-name-item">
<a href="#"
data-id="<%= team.id %>"
class="text-center change-team"
data-turbolinks="false">
class="text-center change-team">
<% if current_team == team %>
<span class="fas fa-check-circle"></span> <strong><%= team.name %></strong>
<% else %>
@ -122,7 +121,7 @@
name="q"
placeholder="<%= t('nav.search') %>" />
<span class="input-group-btn">
<button class="btn btn-default" type="submit"><%= t 'nav.search_button' %></button>
<button class="btn btn-default" id="navigationGoBtn" type="submit"><%= t 'nav.search_button' %></button>
</span>
</div>
<% end %>

2
config/locales/en.yml
View file

@ -1762,7 +1762,7 @@ en:
too_long: "Item name is too long (maximum is %{max_length} characters)"
is_empty: "Item name should be filled"
pagination_edit_overlay_html: "Please <a class=\"repository-save-changes-link\">save your changes</a> before you go to another page"
toolbar_edit_overlay_html: "Please <a class=\"repository-save-changes-link\">save your changes</a> first before using filters"
toolbar_edit_overlay_html: "Please <a class=\"repository-save-changes-link\">save your changes</a> first to use filters"
add_new_record: "New item"
parse_sheet:
help_text: "Match the columns of your uploaded file with already existing columns in database."