From 72abd3b22a4847d5f09bbe6e5aac4b51fe9856f2 Mon Sep 17 00:00:00 2001 From: frea Date: Wed, 16 Oct 2024 16:04:00 +0200 Subject: [PATCH] update "uniqueness" variable --- ActorPrefix.ftl | 16 ++++++++-------- RFXtoRP_RfxConfigurationRp.ftl | 4 +++- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/ActorPrefix.ftl b/ActorPrefix.ftl index 93f5d17..1d7302f 100644 --- a/ActorPrefix.ftl +++ b/ActorPrefix.ftl @@ -5,7 +5,7 @@ <#-- For Depot --> <#function RFXtoRPprefixDepot depot> - <#if uniqueness?? && uniqueness!="" > + <#if uniqueness > <#local actor = depot> <#else> <#if text_language_rfx ="fr"> @@ -34,7 +34,7 @@ <#function RPtoRFXprefixDepot actor> - <#if uniqueness?? && uniqueness!="" > + <#if uniqueness > <#local depot = actor> <#else> <#local depot = actor[4..]> @@ -46,7 +46,7 @@ <#-- For Supplier --> <#function RFXtoRPprefixSupplier supplier> - <#if uniqueness?? && uniqueness!="" > + <#if uniqueness > <#local actor = supplier> <#else> <#if text_language_rfx ="fr"> @@ -75,7 +75,7 @@ <#function RPtoRFXprefixSupplier actor> - <#if uniqueness?? && uniqueness!="" > + <#if uniqueness > <#local supplier = actor> <#else> <#local supplier = actor[4..]> @@ -85,7 +85,7 @@ <#-- For Carrier --> <#function RFXtoRPprefixCarrier carrier> - <#if uniqueness?? && uniqueness!="" > + <#if uniqueness > <#local actor = carrier> <#else> <#if text_language_rfx ="fr"> @@ -114,7 +114,7 @@ <#function RPtoRFXprefixCarrier actor> - <#if uniqueness?? && uniqueness!="" > + <#if uniqueness> <#local carrier = actor> <#else> <#local carrier = actor[4..]> @@ -124,7 +124,7 @@ <#-- For Consignee --> <#function RFXtoRPprefixConsignee consignee> - <#if uniqueness?? && uniqueness!="" > + <#if uniqueness> <#local actor = consignee> <#else> <#if text_language_rfx ="fr"> @@ -153,7 +153,7 @@ <#function RPtoRFXprefixConsignee actor> - <#if uniqueness?? && uniqueness!="" > + <#if uniqueness> <#local consignee = actor> <#else> <#local consignee = actor[4..]> diff --git a/RFXtoRP_RfxConfigurationRp.ftl b/RFXtoRP_RfxConfigurationRp.ftl index c400b77..b8fc3d3 100644 --- a/RFXtoRP_RfxConfigurationRp.ftl +++ b/RFXtoRP_RfxConfigurationRp.ftl @@ -34,6 +34,8 @@ <#if file.reflex_platform_project_list[0].site_code_unicity??> - <#noparse><#assign uniqueness = "${file.reflex_platform_project_list[0].site_code_unicity?string('yes', 'no')}<#noparse>"> + <#noparse><#assign uniqueness = ${file.reflex_platform_project_list[0].site_code_unicity}<#noparse>> +<#else> + <#noparse><#assign uniqueness = false<#noparse>>