From 9a08999ab25f500a5835abb99912a0780c6fb058 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Tue, 18 Oct 2022 12:09:48 +0200
Subject: [PATCH] #722 - removed button from edit page
---
.../transactions/TransactionController.java | 1 -
.../transactions/TransactionModelAttributes.java | 1 -
.../transactions/newTransactionMacros.ftl | 16 +---------------
3 files changed, 1 insertion(+), 17 deletions(-)
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java
index b4fcbaffa..8cb0cac95 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java
@@ -274,7 +274,6 @@ public class TransactionController extends BaseController
if(transaction.getRepeatingOption() != null)
{
transaction = transaction.getRepeatingOption().getFirstReferringTransaction();
- model.addAttribute(TransactionModelAttributes.ACTUAL_OCCURRENCE_TRANSACTION_ID, ID);
}
LocalDate date = dateService.getDateTimeFromCookie(cookieDate);
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionModelAttributes.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionModelAttributes.java
index 541a7a225..fbe58af00 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionModelAttributes.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionModelAttributes.java
@@ -21,5 +21,4 @@ public class TransactionModelAttributes
public static final String ACCOUNTS = "accounts";
public static final String TRANSACTION = "transaction";
public static final String SUGGESTIONS_JSON = "suggestionsJSON";
- public static final String ACTUAL_OCCURRENCE_TRANSACTION_ID = "actualOccurrenceTransactionId";
}
diff --git a/BudgetMasterServer/src/main/resources/templates/transactions/newTransactionMacros.ftl b/BudgetMasterServer/src/main/resources/templates/transactions/newTransactionMacros.ftl
index d6b6d6042..cce06b1ae 100644
--- a/BudgetMasterServer/src/main/resources/templates/transactions/newTransactionMacros.ftl
+++ b/BudgetMasterServer/src/main/resources/templates/transactions/newTransactionMacros.ftl
@@ -160,7 +160,7 @@
</script>
</#macro>
-<#macro transactionRepeating transaction currentDate isEdit>
+<#macro transactionRepeating transaction currentDate>
<div class="row <#if transaction.isRepeating()>hidden</#if>">
<div class="col s12 center-align">
<@header.buttonLink url='' icon='repeat' localizationKey='repeating.button.add' id='button-transaction-add-repeating-option' color='background-blue-baby' noUrl=true classes="text-black"/>
@@ -187,20 +187,6 @@
<@header.buttonLink url='' icon='delete' localizationKey='repeating.button.remove' id='button-transaction-remove-repeating-option' color='background-blue-baby' noUrl=true classes="text-black hidden"/>
</div>
</div>
-
- <div class="row">
- <div class="col s12 center-align">
- <#if isEdit && transaction.isRepeating()>
- <#assign buttonEditFutureClasses='text-black'/>
- <#else>
- <#assign buttonEditFutureClasses='text-black hidden'/>
- </#if>
-
- <#if isEdit && actualOccurrenceTransactionId??>
- <@header.buttonLink url='/transactions/' + actualOccurrenceTransactionId?c + '/editFutureRepetitions' icon='move_up' localizationKey='repeating.button.edit.future' id='button-transaction-edit-future-occurrences' color='background-blue-baby' classes="${buttonEditFutureClasses}"/>
- </#if>
- </div>
- </div>
</#macro>
<#macro repeatingModifier transaction>
--
GitLab