From dafbc72808a102a85d93e5c9e223804b4f7c7dcf Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Wed, 19 Aug 2020 22:28:49 +0200
Subject: [PATCH] #547 - Fixed: cancel template edit leads to wrong page
---
src/main/resources/templates/templates/newTemplate.ftl | 2 +-
.../templates/transactions/newTransactionMacros.ftl | 10 +++++-----
.../templates/transactions/newTransactionNormal.ftl | 2 +-
.../templates/transactions/newTransactionRepeating.ftl | 2 +-
.../templates/transactions/newTransactionTransfer.ftl | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/resources/templates/templates/newTemplate.ftl b/src/main/resources/templates/templates/newTemplate.ftl
index f26697165..92ddcbaaf 100644
--- a/src/main/resources/templates/templates/newTemplate.ftl
+++ b/src/main/resources/templates/templates/newTemplate.ftl
@@ -69,7 +69,7 @@
<br>
<#-- buttons -->
- <@newTransactionMacros.buttons/>
+ <@newTransactionMacros.buttons "/templates"/>
</form>
</div>
</div>
diff --git a/src/main/resources/templates/transactions/newTransactionMacros.ftl b/src/main/resources/templates/transactions/newTransactionMacros.ftl
index bc9518ab6..731f3c2bf 100644
--- a/src/main/resources/templates/transactions/newTransactionMacros.ftl
+++ b/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>
diff --git a/src/main/resources/templates/transactions/newTransactionNormal.ftl b/src/main/resources/templates/transactions/newTransactionNormal.ftl
index fc4e34dae..c9ff04c77 100644
--- a/src/main/resources/templates/transactions/newTransactionNormal.ftl
+++ b/src/main/resources/templates/transactions/newTransactionNormal.ftl
@@ -60,7 +60,7 @@
<br>
<#-- buttons -->
- <@newTransactionMacros.buttons/>
+ <@newTransactionMacros.buttons "/transactions"/>
<@newTransactionMacros.buttonTemplate/>
</form>
diff --git a/src/main/resources/templates/transactions/newTransactionRepeating.ftl b/src/main/resources/templates/transactions/newTransactionRepeating.ftl
index 6c30e5862..0362a0c29 100644
--- a/src/main/resources/templates/transactions/newTransactionRepeating.ftl
+++ b/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>
diff --git a/src/main/resources/templates/transactions/newTransactionTransfer.ftl b/src/main/resources/templates/transactions/newTransactionTransfer.ftl
index a4bbc948d..7eeb0e033 100644
--- a/src/main/resources/templates/transactions/newTransactionTransfer.ftl
+++ b/src/main/resources/templates/transactions/newTransactionTransfer.ftl
@@ -65,7 +65,7 @@
<br>
<#-- buttons -->
- <@newTransactionMacros.buttons/>
+ <@newTransactionMacros.buttons "/transactions"/>
<@newTransactionMacros.buttonTemplate/>
</form>
--
GitLab