mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2025-03-03 19:24:48 +08:00
Merge pull request #5660 from artoscinote/ma_SCI_8506
Make label print modal work globally [SCI-8506]
This commit is contained in:
commit
85ad167998
7 changed files with 8 additions and 9 deletions
|
@ -1,10 +1,10 @@
|
|||
<div class="print-label-modal-container"
|
||||
data-print-url="<%= print_repository_row_path %>"
|
||||
data-zebra-progress-url="<%= print_zpl_repository_row_path%>"
|
||||
data-print-url="<%= print_repository_rows_path %>"
|
||||
data-zebra-progress-url="<%= print_zpl_repository_rows_path%>"
|
||||
data-printers-url="<%= label_printers_path(format: :json) %>"
|
||||
data-label-templates-url="<%= label_templates_path(format: :json) %>"
|
||||
data-rows-url="<%= rows_to_print_repository_row_path %>"
|
||||
data-print-validation-url="<%= validate_label_template_columns_repository_row_path %>"
|
||||
data-rows-url="<%= rows_to_print_repository_rows_path %>"
|
||||
data-print-validation-url="<%= validate_label_template_columns_repository_rows_path %>"
|
||||
data-label-preview-url="<%= zpl_preview_label_templates_path %>"
|
||||
data-fluics-info-url="<%= Constants::SCINOTE_FLUICS_URL %>"
|
||||
data-zebra-enabled="<%= LabelPrinter.zebra_print_enabled? %>"
|
||||
|
|
|
@ -108,6 +108,7 @@
|
|||
<%= render "shared/marvinjs_modal.html.erb" %>
|
||||
<%= render "users/sessions/session_expire_modal.html.erb" %>
|
||||
<%= render "users/sessions/session_end_modal.html.erb" %>
|
||||
<%= render "label_printers/label_printer_modal" %>
|
||||
<% end %>
|
||||
|
||||
<% if user_signed_in? && flash[:system_notification_modal] && current_user.show_login_system_notification? %>
|
||||
|
|
|
@ -138,7 +138,7 @@
|
|||
|
||||
<%= render partial: "my_modules/repositories/full_view_modal" %>
|
||||
<%= render partial: "my_modules/modals/update_repository_records_modal" %>
|
||||
<%= render partial: 'label_printers/label_printer_modal' %>
|
||||
|
||||
|
||||
<%= render partial: "my_modules/protocols/print_protocol_modal", locals: { protocol: @protocol, comments_enabled: true} %>
|
||||
|
||||
|
|
|
@ -97,4 +97,3 @@
|
|||
<%= stylesheet_link_tag 'pdf_js_styles' %>
|
||||
|
||||
<%= render 'shared/tiny_mce_packs' %>
|
||||
<%= render partial: 'label_printers/label_printer_modal' %>
|
||||
|
|
|
@ -55,4 +55,3 @@
|
|||
|
||||
<%= render 'shared/tiny_mce_packs' %>
|
||||
<%= javascript_include_tag 'vue_protocol' %>
|
||||
<%= render partial: 'label_printers/label_printer_modal' %>
|
||||
|
|
|
@ -50,7 +50,7 @@
|
|||
<div class="toolbar-filter-buttons" style="display:none">
|
||||
</div>
|
||||
|
||||
<%= render partial: 'label_printers/label_printer_modal' %>
|
||||
|
||||
|
||||
<%= render partial: "repositories/repository_table",
|
||||
locals: {
|
||||
|
|
|
@ -666,7 +666,7 @@ Rails.application.routes.draw do
|
|||
resources :comments, only: %i(index create update destroy)
|
||||
|
||||
resources :repository_rows, only: %i() do
|
||||
member do
|
||||
collection do
|
||||
get :rows_to_print
|
||||
post :print
|
||||
get :print_zpl
|
||||
|
|
Loading…
Reference in a new issue