From 25d514fb379b8a1b3a434a5b996c7fac9042d9c9 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sun, 20 Feb 2022 11:10:58 +0100
Subject: [PATCH] set default template group on saving a ne template
---
.../budgetmaster/templates/TemplateController.java | 5 +++++
.../deadlocker8/budgetmaster/templates/TemplateService.java | 2 ++
src/main/resources/templates/templates/newTemplate.ftl | 1 +
3 files changed, 8 insertions(+)
diff --git a/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java b/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java
index fc89517f5..a1818369f 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java
@@ -214,6 +214,11 @@ public class TemplateController extends BaseController
}
transactionService.handleTags(template);
+ if(template.getTemplateGroup() == null)
+ {
+ template.setTemplateGroup(templateGroupService.getDefaultGroup());
+ }
+
template.updateIcon(iconService, iconImageID, builtinIconIdentifier, fontColor, templateService);
if(bindingResult.hasErrors())
diff --git a/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateService.java b/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateService.java
index e170b88ce..3e9a4a7a4 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateService.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateService.java
@@ -100,6 +100,8 @@ public class TemplateService implements Resettable, AccessAllEntities<Template>,
template.setAccount(null);
}
+ template.setTemplateGroup(templateGroupService.getDefaultGroup());
+
getRepository().save(template);
}
diff --git a/src/main/resources/templates/templates/newTemplate.ftl b/src/main/resources/templates/templates/newTemplate.ftl
index e9435f90f..853a81a73 100644
--- a/src/main/resources/templates/templates/newTemplate.ftl
+++ b/src/main/resources/templates/templates/newTemplate.ftl
@@ -39,6 +39,7 @@
<form name="NewTemplate" action="<@s.url '/templates/newTemplate'/>" method="post" onsubmit="return validateForm(true)">
<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
<input type="hidden" name="ID" value="<#if template.getID()??>${template.getID()?c}</#if>">
+ <input type="hidden" name="templateGroup" value="<#if template.getTemplateGroup()??>${template.getTemplateGroup().getID()?c}</#if>">
<#-- isPayment switch -->
<@newTransactionMacros.isExpenditureSwitch template/>
--
GitLab