From 9364d139e0ad649d57b734d4176a8fc5f1fc751b Mon Sep 17 00:00:00 2001
From: Martin Artnik <martin@scinote.net>
Date: Thu, 22 Jun 2023 14:52:47 +0200
Subject: [PATCH] Make label print modal work globally [SCI-8506]

---
 app/views/label_printers/_label_printer_modal.html.erb | 8 ++++----
 app/views/layouts/application.html.erb                 | 1 +
 app/views/my_modules/protocols.html.erb                | 2 +-
 app/views/my_modules/results.html.erb                  | 1 -
 app/views/protocols/show.html.erb                      | 1 -
 app/views/repositories/show.html.erb                   | 2 +-
 config/routes.rb                                       | 2 +-
 7 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/views/label_printers/_label_printer_modal.html.erb b/app/views/label_printers/_label_printer_modal.html.erb
index da4eab16a..05a863e58 100644
--- a/app/views/label_printers/_label_printer_modal.html.erb
+++ b/app/views/label_printers/_label_printer_modal.html.erb
@@ -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? %>"
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 3639b9bdc..e9eeeeff6 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -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? %>
diff --git a/app/views/my_modules/protocols.html.erb b/app/views/my_modules/protocols.html.erb
index efa1a32b7..9dfb8a5b3 100644
--- a/app/views/my_modules/protocols.html.erb
+++ b/app/views/my_modules/protocols.html.erb
@@ -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} %>
 
diff --git a/app/views/my_modules/results.html.erb b/app/views/my_modules/results.html.erb
index 069634a81..c4fb49bf9 100644
--- a/app/views/my_modules/results.html.erb
+++ b/app/views/my_modules/results.html.erb
@@ -97,4 +97,3 @@
 <%= stylesheet_link_tag 'pdf_js_styles' %>
 
 <%= render 'shared/tiny_mce_packs' %>
-<%= render partial: 'label_printers/label_printer_modal' %>
diff --git a/app/views/protocols/show.html.erb b/app/views/protocols/show.html.erb
index e227114a8..bb7535d5d 100644
--- a/app/views/protocols/show.html.erb
+++ b/app/views/protocols/show.html.erb
@@ -55,4 +55,3 @@
 
 <%= render 'shared/tiny_mce_packs' %>
 <%= javascript_include_tag 'vue_protocol' %>
-<%= render partial: 'label_printers/label_printer_modal' %>
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index 518bb89fc..3ffecdeb4 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -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: {
diff --git a/config/routes.rb b/config/routes.rb
index 261d9c35d..7a41a2fd0 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -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