#547 - Fixed: cancel template edit leads to wrong page

src/main/resources/templates/templates/newTemplate.ftl

@@ -69,7 +69,7 @@
 
                         <br>
                         <#-- buttons -->
-                        <@newTransactionMacros.buttons/>
+                        <@newTransactionMacros.buttons "/templates"/>
                     </form>
                 </div>
             </div>

src/main/resources/templates/transactions/newTransactionMacros.ftl

@@ -340,10 +340,10 @@
     </div>
 </#macro>
 
-<#macro buttons>
+<#macro buttons cancelURL>
     <div class="row hide-on-small-only">
         <div class="col s6 right-align">
-            <@buttonCancel/>
+            <@buttonCancel cancelURL/>
         </div>
 
         <div class="col s6 left-align">
@@ -354,7 +354,7 @@
     <div class="hide-on-med-and-up">
         <div class="row center-align">
             <div class="col s12">
-                <@buttonCancel/>
+                <@buttonCancel cancelURL/>
             </div>
         </div>
         <div class="row center-align">
@@ -365,8 +365,8 @@
     </div>
 </#macro>
 
-<#macro buttonCancel>
-    <a href="<@s.url '/transactions'/>" class="waves-effect waves-light btn budgetmaster-blue"><i class="material-icons left">clear</i>${locale.getString("cancel")}</a>
+<#macro buttonCancel cancelURL>
+    <a href="<@s.url cancelURL/>" class="waves-effect waves-light btn budgetmaster-blue"><i class="material-icons left">clear</i>${locale.getString("cancel")}</a>
 </#macro>
 
 <#macro buttonSave>

src/main/resources/templates/transactions/newTransactionNormal.ftl

@@ -60,7 +60,7 @@
 
                         <br>
                         <#-- buttons -->
-                        <@newTransactionMacros.buttons/>
+                        <@newTransactionMacros.buttons "/transactions"/>
                         <@newTransactionMacros.buttonTemplate/>
                     </form>
 

src/main/resources/templates/transactions/newTransactionRepeating.ftl

@@ -60,7 +60,7 @@
                         <@newTransactionMacros.transactionRepeating transaction currentDate/>
                         <br>
                         <#-- buttons -->
-                        <@newTransactionMacros.buttons/>
+                        <@newTransactionMacros.buttons "/transactions"/>
                     </form>
                 </div>
             </div>

src/main/resources/templates/transactions/newTransactionTransfer.ftl

@@ -65,7 +65,7 @@
 
                         <br>
                         <#-- buttons -->
-                        <@newTransactionMacros.buttons/>
+                        <@newTransactionMacros.buttons "/transactions"/>
                         <@newTransactionMacros.buttonTemplate/>
                     </form>