From b8572004081a320d14837e76ecff94ad0ad05dca Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sun, 11 Sep 2022 10:56:23 +0200
Subject: [PATCH] Fixed #718 - new template page should not force input amount

---
 .../main/resources/templates/templates/newTemplate.ftl |  2 +-
 .../templates/transactions/newTransactionMacros.ftl    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/BudgetMasterServer/src/main/resources/templates/templates/newTemplate.ftl b/BudgetMasterServer/src/main/resources/templates/templates/newTemplate.ftl
index 497073d3d..6ad6015a4 100644
--- a/BudgetMasterServer/src/main/resources/templates/templates/newTemplate.ftl
+++ b/BudgetMasterServer/src/main/resources/templates/templates/newTemplate.ftl
@@ -87,7 +87,7 @@
                         <@fontColorPickerMacros.fontColorPicker template/>
 
                         <#-- buttons -->
-                        <@newTransactionMacros.buttons cancelURL="/templates" includeContinueButton=false/>
+                        <@newTransactionMacros.buttons cancelURL="/templates" includeContinueButton=false allowEmptyAmount=true/>
                     </form>
 
                     <div id="transactionNameKeywordWarningModalContainer"></div>
diff --git a/BudgetMasterServer/src/main/resources/templates/transactions/newTransactionMacros.ftl b/BudgetMasterServer/src/main/resources/templates/transactions/newTransactionMacros.ftl
index 65dc7c6fb..cce06b1ae 100644
--- a/BudgetMasterServer/src/main/resources/templates/transactions/newTransactionMacros.ftl
+++ b/BudgetMasterServer/src/main/resources/templates/transactions/newTransactionMacros.ftl
@@ -310,7 +310,7 @@
     </div>
 </#macro>
 
-<#macro buttons cancelURL includeContinueButton>
+<#macro buttons cancelURL includeContinueButton allowEmptyAmount=false>
     <div id="keywordCheckUrl" class="hidden" data-url="<@s.url '/keywords/keywordCheck'/>"></div>
 
     <br>
@@ -323,7 +323,7 @@
             <#if includeContinueButton>
                 <@buttonSaveAndContinue/>&nbsp;
             </#if>
-            <@buttonSave/>
+            <@buttonSave allowEmptyAmount/>
         </div>
     </div>
 
@@ -342,7 +342,7 @@
         </#if>
         <div class="row center-align">
             <div class="col s12">
-                <@buttonSave/>
+                <@buttonSave allowEmptyAmount/>
             </div>
         </div>
     </div>
@@ -352,8 +352,8 @@
     <@header.buttonLink url=cancelURL icon='clear' localizationKey='cancel' id='button-cancel-save-transaction' color='red'/>
 </#macro>
 
-<#macro buttonSave>
-    <@header.buttonSubmit name='action' icon='save' localizationKey='save' id='button-save-transaction' color='green' onclick='return validateForm(false, false, false)'/>
+<#macro buttonSave allowEmptyAmount>
+    <@header.buttonSubmit name='action' icon='save' localizationKey='save' id='button-save-transaction' color='green' onclick='return validateForm(false, ${allowEmptyAmount?c}, false)'/>
 </#macro>
 
 <#macro buttonSaveAndContinue>
-- 
GitLab