diff --git a/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java b/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java
index f2ffc45f21499389bb609e63680aa5c7fd27ab6e..a6054587473834ada0af1a04e8f3364605dec48f 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java
@@ -146,7 +146,7 @@ public class TemplateController extends BaseController
}
final DateTime date = dateService.getDateTimeFromCookie(cookieDate);
- transactionService.prepareModelNewOrEdit(model, false, date, null, newTransaction, accountService.getAllActivatedAccountsAsc());
+ transactionService.prepareModelNewOrEdit(model, false, date, false, newTransaction, accountService.getAllActivatedAccountsAsc());
if(newTransaction.isTransfer())
{
diff --git a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java
index 7b49534fa84098ddee87dc0b2259cab344c2074e..3733d4d5d575226b402d68e33b5f2aadf194923c 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java
@@ -127,7 +127,7 @@ public class TransactionController extends BaseController
DateTime date = dateService.getDateTimeFromCookie(cookieDate);
Transaction emptyTransaction = new Transaction();
emptyTransaction.setCategory(categoryService.findByType(CategoryType.NONE));
- transactionService.prepareModelNewOrEdit(model, false, date, null, emptyTransaction, accountService.getAllActivatedAccountsAsc());
+ transactionService.prepareModelNewOrEdit(model, false, date, false, emptyTransaction, accountService.getAllActivatedAccountsAsc());
return "transactions/newTransaction" + StringUtils.capitalize(type);
}
@@ -135,7 +135,6 @@ public class TransactionController extends BaseController
public String post(Model model, @CookieValue("currentDate") String cookieDate,
@ModelAttribute("NewTransaction") Transaction transaction, BindingResult bindingResult,
@RequestParam(value = "isRepeating", required = false) boolean isRepeating,
- @RequestParam(value = "previousType", required = false) TransactionType previousType,
@RequestParam(value = "repeatingModifierNumber", required = false, defaultValue = "0") int repeatingModifierNumber,
@RequestParam(value = "repeatingModifierType", required = false) String repeatingModifierType,
@RequestParam(value = "repeatingEndType", required = false) String repeatingEndType,
@@ -212,7 +211,7 @@ public class TransactionController extends BaseController
if(bindingResult.hasErrors())
{
model.addAttribute("error", bindingResult);
- transactionService.prepareModelNewOrEdit(model, isEdit, date, null, transaction, accountService.getAllActivatedAccountsAsc());
+ transactionService.prepareModelNewOrEdit(model, isEdit, date, false, transaction, accountService.getAllActivatedAccountsAsc());
return url;
}
@@ -243,7 +242,7 @@ public class TransactionController extends BaseController
}
DateTime date = dateService.getDateTimeFromCookie(cookieDate);
- transactionService.prepareModelNewOrEdit(model, true, date, null, transaction, accountService.getAllActivatedAccountsAsc());
+ transactionService.prepareModelNewOrEdit(model, true, date, false, transaction, accountService.getAllActivatedAccountsAsc());
if(transaction.isTransfer())
{
@@ -315,8 +314,6 @@ public class TransactionController extends BaseController
final TransactionType newTransactionType = transactionTypeOptional.get();
LOGGER.debug(MessageFormat.format("Changing transaction type to {0} for transaction with ID {1}", newTransactionType, String.valueOf(transaction.getID())));
- final TransactionType previousType = TransactionType.getFromTransaction(transaction);
-
String redirectUrl = "";
switch(newTransactionType)
{
@@ -332,7 +329,7 @@ public class TransactionController extends BaseController
}
DateTime date = dateService.getDateTimeFromCookie(cookieDate);
- transactionService.prepareModelNewOrEdit(model, true, date, previousType, transactionCopy, accountService.getAllActivatedAccountsAsc());
+ transactionService.prepareModelNewOrEdit(model, true, date, true, transactionCopy, accountService.getAllActivatedAccountsAsc());
return redirectUrl;
}
diff --git a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionService.java b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionService.java
index 2e3723cdc1443bc3f9b9c1e56bab3f4ad5460269..57c57987cf10a73eb715d3143786367c2fece5ac 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionService.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionService.java
@@ -288,11 +288,11 @@ public class TransactionService implements Resettable
return item;
}
- public void prepareModelNewOrEdit(Model model, boolean isEdit, DateTime date, TransactionType previousType, TransactionBase item, List<Account> accounts)
+ public void prepareModelNewOrEdit(Model model, boolean isEdit, DateTime date, boolean changeTypeInProgress, TransactionBase item, List<Account> accounts)
{
model.addAttribute("isEdit", isEdit);
model.addAttribute("currentDate", date);
- model.addAttribute("previousType", previousType);
+ model.addAttribute("changeTypeInProgress", changeTypeInProgress);
model.addAttribute("categories", categoryService.getAllEntitiesAsc());
model.addAttribute("accounts", accounts);
model.addAttribute("transaction", item);
diff --git a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionType.java b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionType.java
index 26ba6bab1cc89c9d9ccdc6239c9072ee4dcb60a0..e24f025e30e092f73c59df8be03f756ecf038a38 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionType.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionType.java
@@ -32,18 +32,6 @@ public enum TransactionType
}
}
- public static TransactionType getFromTransaction(Transaction transaction)
- {
- if(transaction.isTransfer())
- {
- return TRANSFER;
- }
- else
- {
- return NORMAL;
- }
- }
-
@Override
public String toString()
{
diff --git a/src/main/resources/templates/transactions/newTransactionMacros.ftl b/src/main/resources/templates/transactions/newTransactionMacros.ftl
index 4a454bc1459fed885871adbe9489b93767916e52..3a8173625ffbb9c0f1a8af68c53d5b7655620447 100644
--- a/src/main/resources/templates/transactions/newTransactionMacros.ftl
+++ b/src/main/resources/templates/transactions/newTransactionMacros.ftl
@@ -340,8 +340,8 @@
<@header.buttonSubmit name='action' icon='save' localizationKey='save' id='button-save-transaction'/>
</#macro>
-<#macro buttonTransactionActions canChangeType canCreateTemplate changetypeInProgress>
- <#if (canChangeType || canCreateTemplate) && !changetypeInProgress>
+<#macro buttonTransactionActions canChangeType canCreateTemplate changeTypeInProgress>
+ <#if (canChangeType || canCreateTemplate) && !changeTypeInProgress>
<div class="fixed-action-btn" id="transaction-actions-button">
<a class="btn-floating btn-large waves-effect waves-light background-blue">
<i class="material-icons left">settings</i>${locale.getString("save")}
diff --git a/src/main/resources/templates/transactions/newTransactionNormal.ftl b/src/main/resources/templates/transactions/newTransactionNormal.ftl
index 9bbab097ba059d3cbf56aa8887378c1461157ce9..6be93a6ac5a488a0d974259d486c67018aa27f09 100644
--- a/src/main/resources/templates/transactions/newTransactionNormal.ftl
+++ b/src/main/resources/templates/transactions/newTransactionNormal.ftl
@@ -38,7 +38,6 @@
<!-- only set ID for transactions not templates, otherwise the input is filled with the template ID and saving the transaction
may then override an existing transactions if the ID is also already used in transactions table -->
<input type="hidden" name="ID" value="<#if transaction.class.simpleName == "Transaction" && transaction.getID()??>${transaction.getID()?c}</#if>">
- <input type="hidden" name="previousType" value="<#if previousType??>${previousType.name()}</#if>">
<input type="hidden" name="isRepeating" value="${transaction.isRepeating()?c}">
<#-- isPayment switch -->
@@ -78,7 +77,7 @@
<#-- buttons -->
<@newTransactionMacros.buttons '/transactions'/>
- <@newTransactionMacros.buttonTransactionActions isEdit true previousType??/>
+ <@newTransactionMacros.buttonTransactionActions isEdit true changeTypeInProgress/>
</form>
<div id="saveAsTemplateModalContainer"></div>
diff --git a/src/main/resources/templates/transactions/newTransactionTransfer.ftl b/src/main/resources/templates/transactions/newTransactionTransfer.ftl
index 36ca67f351de3bafc88bc52d7ce8ae049fad2dad..3cc80948cc8077d16ed5477832aa7f7ce51c93d7 100644
--- a/src/main/resources/templates/transactions/newTransactionTransfer.ftl
+++ b/src/main/resources/templates/transactions/newTransactionTransfer.ftl
@@ -39,7 +39,6 @@
may then override an existing transactions if the ID is also already used in transactions table -->
<input type="hidden" name="ID" value="<#if transaction.class.simpleName == "Transaction" && transaction.getID()??>${transaction.getID()?c}</#if>">
<input type="hidden" name="isExpenditure" value="true">
- <input type="hidden" name="previousType" value="<#if previousType??>${previousType.name()}</#if>">
<input type="hidden" name="isRepeating" value="${transaction.isRepeating()?c}">
<#assign hint=helpers.getHintByLocalizationKey("hint.transaction.save")/>
@@ -84,7 +83,7 @@
<#-- buttons -->
<@newTransactionMacros.buttons '/transactions'/>
- <@newTransactionMacros.buttonTransactionActions isEdit true previousType??/>
+ <@newTransactionMacros.buttonTransactionActions isEdit true changeTypeInProgress/>
</form>
<div id="saveAsTemplateModalContainer"></div>