From 56fb8a4efa39e7988c528ce1bf0eb1a2ec940fd1 Mon Sep 17 00:00:00 2001 From: ajugo Date: Mon, 16 Jan 2023 10:23:34 +0100 Subject: [PATCH] Fix hoover tooltip for company logo [SCI-7766] (#4827) --- app/controllers/label_templates_controller.rb | 4 ++-- app/serializers/label_template_serializer.rb | 2 +- app/services/label_templates/tag_service.rb | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/controllers/label_templates_controller.rb b/app/controllers/label_templates_controller.rb index a1d235a94..1577219df 100644 --- a/app/controllers/label_templates_controller.rb +++ b/app/controllers/label_templates_controller.rb @@ -7,7 +7,7 @@ class LabelTemplatesController < ApplicationController 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) before_action :load_label_templates, only: %i(index datatable) - before_action :load_label_template, only: %i(show set_default update) + before_action :load_label_template, only: %i(show set_default update template_tags) layout 'fluid' @@ -125,7 +125,7 @@ class LabelTemplatesController < ApplicationController end def template_tags - render json: LabelTemplates::TagService.new(current_team).tags + render json: LabelTemplates::TagService.new(current_team, @label_template).tags end def zpl_preview diff --git a/app/serializers/label_template_serializer.rb b/app/serializers/label_template_serializer.rb index e7bda08a8..58c0f0c6b 100644 --- a/app/serializers/label_template_serializer.rb +++ b/app/serializers/label_template_serializer.rb @@ -15,7 +15,7 @@ class LabelTemplateSerializer < ActiveModel::Serializer return {} unless can_manage_label_templates?(object.team) { update: label_template_path(object), - fields: template_tags_label_templates_path + fields: template_tags_label_templates_path(id: object.id) } end end diff --git a/app/services/label_templates/tag_service.rb b/app/services/label_templates/tag_service.rb index 310d7d437..b9943a7fd 100644 --- a/app/services/label_templates/tag_service.rb +++ b/app/services/label_templates/tag_service.rb @@ -9,8 +9,9 @@ module LabelTemplates { key: 'added_by', tag: '{{ADDED_BY}}' } ].freeze - def initialize(team) + def initialize(team, label_template) @team = team + @label_template = label_template end def tags