From a2419dc4f1f4e6f47f53b497cee664dc4bd929c1 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Mon, 11 May 2020 20:57:14 +0200
Subject: [PATCH] #338 - fixed duplicated macro name
---
src/main/resources/templates/templates/newTemplate.ftl | 2 +-
src/main/resources/templates/templates/templateFunctions.ftl | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/templates/templates/newTemplate.ftl b/src/main/resources/templates/templates/newTemplate.ftl
index a6ff77ef1..b1e2d68d5 100644
--- a/src/main/resources/templates/templates/newTemplate.ftl
+++ b/src/main/resources/templates/templates/newTemplate.ftl
@@ -32,7 +32,7 @@
<@newTransactionMacros.isExpenditureSwitch template isPayment/>
<#-- template name -->
- <@templateFunctions.templateName template/>
+ <@templateFunctions.templateNameInput template/>
<#-- name -->
<@newTransactionMacros.transactionName template suggestionsJSON/>
diff --git a/src/main/resources/templates/templates/templateFunctions.ftl b/src/main/resources/templates/templates/templateFunctions.ftl
index 2ad4251a5..04c34cf26 100644
--- a/src/main/resources/templates/templates/templateFunctions.ftl
+++ b/src/main/resources/templates/templates/templateFunctions.ftl
@@ -129,7 +129,7 @@
</#if>
</#macro>
-<#macro templateName template>
+<#macro templateNameInput template>
<div class="row">
<div class="input-field col s12 m12 l8 offset-l2">
<input id="template-name" type="text" name="templateName" <@validation.validation "templateName"/> value="<#if template.getTemplateName()??>${template.getTemplateName()}</#if>">
--
GitLab