From f0e8d5eb19aed09dbc678ec0a20ccc9e4aa1c61c Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sat, 6 Jun 2020 21:28:09 +0200
Subject: [PATCH] Fixed #517 - recurring transactions: preselect month as
 repeating type

---
 .../transactions/newTransactionMacros.ftl        | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/templates/transactions/newTransactionMacros.ftl b/src/main/resources/templates/transactions/newTransactionMacros.ftl
index 5702f7fd4..69edc1a37 100644
--- a/src/main/resources/templates/transactions/newTransactionMacros.ftl
+++ b/src/main/resources/templates/transactions/newTransactionMacros.ftl
@@ -223,16 +223,18 @@
         <input type="hidden" id="hidden-transaction-repeating-modifier" name="repeatingModifierNumber" value="<#if transaction.getRepeatingOption()??>${transaction.getRepeatingOption().getModifier().getQuantity()}</#if>">
 
         <div class="input-field col s6 m6 l4">
+
+            <#if transaction.getRepeatingOption()??>
+                <#assign selectedOption=locale.getString(transaction.getRepeatingOption().getModifier().getLocalizationKey())>
+            <#else>
+                <#assign selectedOption=locale.getString("repeating.modifier.months")>
+            </#if>
+
             <select id="transaction-repeating-modifier-type" name="repeatingModifierType">
                 <#list helpers.getRepeatingModifierTypes() as modifierType>
                     <#assign modifierName=locale.getString(modifierType.getLocalizationKey())>
-                    <#if transaction.getRepeatingOption()??>
-                        ${transaction.getRepeatingOption().getModifier().getLocalizationKey()}
-                        <#if locale.getString(transaction.getRepeatingOption().getModifier().getLocalizationKey()) == modifierName>
-                            <option selected value="${modifierName}">${modifierName}</option>
-                        <#else>
-                            <option value="${modifierName}">${modifierName}</option>
-                        </#if>
+                    <#if selectedOption == modifierName>
+                        <option selected value="${modifierName}">${modifierName}</option>
                     <#else>
                         <option value="${modifierName}">${modifierName}</option>
                     </#if>
-- 
GitLab