From e2f0591b22d5b7aed3c6d7f866e203ee5307f787 Mon Sep 17 00:00:00 2001 From: Mikhail Kuznetsov Date: Tue, 27 Aug 2024 12:27:30 +1000 Subject: [PATCH] =?UTF-8?q?feat(api,esppTemplateSync):=20=D0=B4=D0=BE?= =?UTF-8?q?=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=20shortcode=20=D0=AD=D0=9A?= =?UTF-8?q?=20=D0=B2=20=D0=BA=D1=80=D0=B0=D1=82=D0=BA=D0=BE=D0=B5=20=D0=BE?= =?UTF-8?q?=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B8=D0=B5=20=D1=88=D0=B0=D0=B1?= =?UTF-8?q?=D0=BB=D0=BE=D0=BD=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PARR.API/MappingProfiles/DomainToResponseProfile.cs | 2 +- PARR.EsppTemplateSync/TemplateMQSyncer.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PARR.API/MappingProfiles/DomainToResponseProfile.cs b/PARR.API/MappingProfiles/DomainToResponseProfile.cs index 25c90a37..95959535 100644 --- a/PARR.API/MappingProfiles/DomainToResponseProfile.cs +++ b/PARR.API/MappingProfiles/DomainToResponseProfile.cs @@ -137,7 +137,7 @@ namespace PARR.API.MappingProfiles .ForMember(d => d.IsActive, o => o.MapFrom(s => s.Template!.IsActiveTemplate)) .ForMember(d => d.ClosingCode, o => o.MapFrom()) .ForMember(d => d.FullDescription, o => o.MapFrom(s => s.Template!.ApplicationsInWork!.FullDescription)) - .ForMember(d => d.ShortDescription, o => o.MapFrom(s => s.Template!.ApplicationsInWork!.ShortDescription)) + .ForMember(d => d.ShortDescription, o => o.MapFrom(s => s.Template!.ApplicationsInWork!.ShortDescription.ApplyShortcode(Shortcodes.EK, s.Template!.Host!.Ek))) .ForMember(d => d.Solution, o => o.MapFrom(s => s.Template!.ApplicationsInWork!.Solution)) //.ForMember(d => d.ResponseArea, o => o.MapFrom(s => s.Template!.Host!.ResponseArea!.Name)) //ЗО берем у группы а не у хоста diff --git a/PARR.EsppTemplateSync/TemplateMQSyncer.cs b/PARR.EsppTemplateSync/TemplateMQSyncer.cs index aa82ab7c..7d613779 100644 --- a/PARR.EsppTemplateSync/TemplateMQSyncer.cs +++ b/PARR.EsppTemplateSync/TemplateMQSyncer.cs @@ -75,7 +75,7 @@ namespace PARR.EsppTemplateSync IsActive = template.IsActiveTemplate, //WorkGroup = template.Host!.WorkGroup!, WorkGroup = template.Host!.WorkGroup!.Name, - ShortDescription = Normalize(template.ApplicationsInWork!.ShortDescription), + ShortDescription = Normalize(template.ApplicationsInWork!.ShortDescription.ApplyShortcode(Constants.Shortcode.Shortcodes.EK,template.Host.Ek)), //ResponseArea = template.Host!.ResponseArea!.Name, //ЗО берем РГ а не хоста ResponseArea = template.Host!.WorkGroup!.ResponseArea!.Name,