scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-10-06 11:57:16 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix zebra printer switch and optimize zebra library loading [SCI-7430] (#4612)

Browse source 
* Fix zebra printer switch and optimize zebra library loading [SCI-7430]

* Fix zebra enabled [SCI-7430]
This commit is contained in:
ajugo 2022-11-14 10:43:09 +01:00 • committed by GitHub
parent 4e77174e52
commit 42af732073
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/application.js.erb
View file

@ -56,8 +56,6 @@
//= require_directory ./access_permissions //= require_directory ./access_permissions
//= require sidebar //= require sidebar
//= require turbolinks //= require turbolinks
//= require 'BrowserPrint-3.0.216.min'
//= require 'BrowserPrint-Zebra-1.0.216.min'
// Initialize links for submitting forms. This is useful for submitting // Initialize links for submitting forms. This is useful for submitting
// forms with clicking on links outside form in cases when other than // forms with clicking on links outside form in cases when other than

2
app/models/label_printer.rb
View file

@ -20,7 +20,7 @@ class LabelPrinter < ApplicationRecord
validates :language_type, presence: true validates :language_type, presence: true
def self.zebra_print_enabled? def self.zebra_print_enabled?
RepositoryBase.stock_management_enabled? RepositoryBase.stock_management_enabled?.present?
end end
def done? def done?

1
app/views/label_printers/_label_printer_modal.html.erb
View file

@ -18,4 +18,5 @@
></print-modal-container> ></print-modal-container>
</div> </div>
<%= render partial: 'label_printers/zebra_printer_library' %>
<%= javascript_pack_tag 'vue/repository_print_modal' %> <%= javascript_pack_tag 'vue/repository_print_modal' %>

4
app/views/label_printers/_zebra_printer_library.html.erb Normal file
View file

@ -0,0 +1,4 @@
<% if LabelPrinter.zebra_print_enabled? %>
<%= javascript_include_tag 'BrowserPrint-3.0.216.min' %>
<%= javascript_include_tag 'BrowserPrint-Zebra-1.0.216.min' %>
<% end %>

1
app/views/label_printers/_zebra_settings.html.erb
View file

@ -77,4 +77,5 @@
</li> </li>
</ul> </ul>
<%= render partial: 'label_printers/zebra_printer_library' %>
<%= javascript_include_tag "label_printers/zebra_settings" %> <%= javascript_include_tag "label_printers/zebra_settings" %>