scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-25 01:03:18 +08:00
Code Issues Projects Releases Packages Wiki Activity

Small label printers fixes [SCI-6021][SCI-6024] (#3502)

Browse source
This commit is contained in:
aignatov-bio 2021-08-23 13:58:16 +02:00 committed by GitHub
parent 546b108bd2
commit 7621deeb2a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -101,6 +101,7 @@ var RepositoryDatatable = (function(global) {
$('th').addClass('disable-click');
$('.repository-row-selector').prop('disabled', true);
$('.dataTables_filter input').prop('disabled', true);
$('#toolbarPrintLabel').hide();
}
$('#toolbarPrintLabel').data('rows', JSON.stringify(rowsSelected));

0
app/javascript/packs/custom/bwipjs.js → app/javascript/packs/application.js
View file

2
app/views/layouts/application.html.erb
View file

@ -7,6 +7,8 @@
<meta name="max-file-size" content="<%= Rails.configuration.x.file_max_size_mb %>">
<%= stylesheet_link_tag 'application', media: 'all' %>
<%= javascript_include_tag 'application' %>
<%= javascript_pack_tag 'application' %>
<% if MarvinJsService.enabled? && ENV['MARVINJS_API_KEY'] %>
<script src="https://marvinjs.chemicalize.com/v1/<%= ENV['MARVINJS_API_KEY'] %>/client-settings.js"></script>

1
app/views/repositories/show.html.erb
View file

@ -178,7 +178,6 @@
<%= javascript_pack_tag 'emoji_button' %>
<%= javascript_pack_tag 'pdfjs/pdf_js' %>
<%= stylesheet_pack_tag 'pdfjs/pdf_js_styles' %>
<%= javascript_pack_tag 'custom/bwipjs' %>
<script type="text/javascript" charset="utf-8">
var formatJS = "<%= datetime_picker_format_date_only %>"