From 7b3e5a06e01bcb0c743bb72c1e40909cb88e24d4 Mon Sep 17 00:00:00 2001 From: Anton Date: Fri, 12 Apr 2024 11:17:09 +0200 Subject: [PATCH] Fix label templates seelctor in print modal [SCI-10632] --- app/controllers/label_templates_controller.rb | 6 +++++- app/javascript/vue/repository_print_modal/container.vue | 2 +- app/views/label_printers/_label_printer_modal.html.erb | 2 +- config/routes.rb | 1 + 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/controllers/label_templates_controller.rb b/app/controllers/label_templates_controller.rb index 8727edcce..32d9bbc23 100644 --- a/app/controllers/label_templates_controller.rb +++ b/app/controllers/label_templates_controller.rb @@ -5,7 +5,7 @@ class LabelTemplatesController < ApplicationController include TeamsHelper before_action :check_feature_enabled, except: %i(index zpl_preview) - before_action :load_label_templates, only: %i(index datatable) + before_action :load_label_templates, only: %i(index datatable list) before_action :load_label_template, only: %i(show set_default update template_tags) before_action :check_view_permissions, except: %i(create duplicate set_default delete update) before_action :check_manage_permissions, only: %i(create duplicate set_default delete update) @@ -29,6 +29,10 @@ class LabelTemplatesController < ApplicationController end end + def list + render json: @label_templates, each_serializer: LabelTemplateSerializer, user: current_user + end + def show respond_to do |format| format.json { render json: @label_template, serializer: LabelTemplateSerializer, user: current_user } diff --git a/app/javascript/vue/repository_print_modal/container.vue b/app/javascript/vue/repository_print_modal/container.vue index ac721d6ec..49d6b3f1b 100644 --- a/app/javascript/vue/repository_print_modal/container.vue +++ b/app/javascript/vue/repository_print_modal/container.vue @@ -272,7 +272,7 @@ export default { templateOption(option) { return `
- ${option.params.icon} + ${option.label}
`; diff --git a/app/views/label_printers/_label_printer_modal.html.erb b/app/views/label_printers/_label_printer_modal.html.erb index 68579dc8b..23316e8d1 100644 --- a/app/views/label_printers/_label_printer_modal.html.erb +++ b/app/views/label_printers/_label_printer_modal.html.erb @@ -2,7 +2,7 @@ data-print-url="<%= print_repositories_path %>" data-zebra-progress-url="<%= print_zpl_repositories_path %>" data-printers-url="<%= label_printers_path(format: :json) %>" - data-label-templates-url="<%= label_templates_path(format: :json) %>" + data-label-templates-url="<%= list_label_templates_path(format: :json) %>" data-rows-url="<%= rows_to_print_repositories_path %>" data-print-validation-url="<%= validate_label_template_columns_repositories_path %>" data-label-preview-url="<%= zpl_preview_label_templates_path %>" diff --git a/config/routes.rb b/config/routes.rb index 0d24122b4..cd0d9ab73 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -53,6 +53,7 @@ Rails.application.routes.draw do post :set_default end collection do + get :list post :duplicate delete :delete get :datatable