diff --git a/BudgetMasterServer/src/main/resources/static/js/settingsContainers.js b/BudgetMasterServer/src/main/resources/static/js/settingsContainers.js
index 71f6cac90f28fe4eef0398a79c5ffff57f5b8b4a..d5d563039d1f1dca2870582855dab092e2b7c74d 100644
--- a/BudgetMasterServer/src/main/resources/static/js/settingsContainers.js
+++ b/BudgetMasterServer/src/main/resources/static/js/settingsContainers.js
@@ -6,7 +6,7 @@ function initSettingsContainer(formName, containerId)
$.ajax({
type: 'POST',
- url: form.action.formAction,
+ url: $(this).attr('action'),
data: new FormData(form),
processData: false,
contentType: false,
diff --git a/BudgetMasterServer/src/main/resources/templates/settings/containers/settingsBackup.ftl b/BudgetMasterServer/src/main/resources/templates/settings/containers/settingsBackup.ftl
index 75aace9dea9ad30976a515c35543977746cc69ef..ff1b19a44c410a1b53a4517790c3d8287e9c90a6 100644
--- a/BudgetMasterServer/src/main/resources/templates/settings/containers/settingsBackup.ftl
+++ b/BudgetMasterServer/src/main/resources/templates/settings/containers/settingsBackup.ftl
@@ -7,7 +7,7 @@
<#import "../settingsMacros.ftl" as settingsMacros>
<#macro backupSettingsContainer importScripts settings>
- <@settingsContainerMacros.settingsContainer 'BackupSettingsContainer' 'backupSettingsContainer' importScripts true>
+ <@settingsContainerMacros.settingsContainer 'BackupSettingsContainer' 'backupSettingsContainer' importScripts '/settings/save/backup' true>
<div class="row">
<div class="col s12">
<div class="table-container">
@@ -38,7 +38,7 @@
<div class="row">
<div class="col s12 center-align">
- <@header.buttonSubmit name='action' icon='save' localizationKey='save' color='background-green' formaction='/settings/save/backup'/>
+ <@header.buttonSubmit name='action' icon='save' localizationKey='save' color='background-green'/>
</div>
</div>
diff --git a/BudgetMasterServer/src/main/resources/templates/settings/containers/settingsContainer.ftl b/BudgetMasterServer/src/main/resources/templates/settings/containers/settingsContainer.ftl
index 282aaae51a8ff81f7db919023897e8551528f9d8..48d9f29bf21e4ab4d8233f5e1ce22a1caed80592 100644
--- a/BudgetMasterServer/src/main/resources/templates/settings/containers/settingsContainer.ftl
+++ b/BudgetMasterServer/src/main/resources/templates/settings/containers/settingsContainer.ftl
@@ -1,7 +1,7 @@
<#import "/spring.ftl" as s>
-<#macro settingsContainer formName containerId importScripts validateForm=false>
- <form name="${formName}" method="post" <#if validateForm>onsubmit="return validateForm()"</#if>>
+<#macro settingsContainer formName containerId importScripts actionUrl validateForm=false>
+ <form name="${formName}" method="post" <#if validateForm>onsubmit="return validateForm()"</#if> action="<@s.url actionUrl/>">
<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}" id="token"/>
<#nested>
diff --git a/BudgetMasterServer/src/main/resources/templates/settings/containers/settingsMisc.ftl b/BudgetMasterServer/src/main/resources/templates/settings/containers/settingsMisc.ftl
index 8722a6adccfc31cc0ab0770a4a93c79d6d117ae7..3ad2bc19505049d8fbe771353d8e3fb4fef00f9b 100644
--- a/BudgetMasterServer/src/main/resources/templates/settings/containers/settingsMisc.ftl
+++ b/BudgetMasterServer/src/main/resources/templates/settings/containers/settingsMisc.ftl
@@ -7,10 +7,10 @@
<#import "../settingsMacros.ftl" as settingsMacros>
<#macro miscSettingsContainer importScripts>
- <@settingsContainerMacros.settingsContainer 'MiscSettingsContainer' 'miscSettingsContainer' importScripts>
+ <@settingsContainerMacros.settingsContainer 'MiscSettingsContainer' 'miscSettingsContainer' importScripts '/settings/save/misc'>
<div class="row no-margin-bottom">
<div class="col s12 center-align">
- <@header.buttonSubmit name='action' icon='restore' localizationKey='button.hints.reset' color='background-blue' formaction='/settings/save/misc'/>
+ <@header.buttonSubmit name='action' icon='restore' localizationKey='button.hints.reset' color='background-blue'/>
</div>
</div>
</@settingsContainerMacros.settingsContainer>
diff --git a/BudgetMasterServer/src/main/resources/templates/settings/containers/settingsPersonalization.ftl b/BudgetMasterServer/src/main/resources/templates/settings/containers/settingsPersonalization.ftl
index 5bae17b9814988aeb07a6b8263b93dd9f7a41348..ecfbf3bef48109e78443949cb39a5ab4760c768e 100644
--- a/BudgetMasterServer/src/main/resources/templates/settings/containers/settingsPersonalization.ftl
+++ b/BudgetMasterServer/src/main/resources/templates/settings/containers/settingsPersonalization.ftl
@@ -7,7 +7,7 @@
<#import "../settingsMacros.ftl" as settingsMacros>
<#macro personalizationSettingsContainer importScripts settings showReloadWarning>
- <@settingsContainerMacros.settingsContainer 'PersonalizationSettingsContainer' 'personalizationSettingsContainer' importScripts>
+ <@settingsContainerMacros.settingsContainer 'PersonalizationSettingsContainer' 'personalizationSettingsContainer' importScripts '/settings/save/personalization'>
<#-- language -->
<div class="row">
<div class="input-field col s12 m12 l8 offset-l2">
@@ -56,7 +56,7 @@
<div class="row">
<div class="col s12 center-align">
- <@header.buttonSubmit name='action' icon='save' localizationKey='save' color='background-green' formaction='/settings/save/personalization'/>
+ <@header.buttonSubmit name='action' icon='save' localizationKey='save' color='background-green'/>
</div>
</div>
diff --git a/BudgetMasterServer/src/main/resources/templates/settings/containers/settingsSecurity.ftl b/BudgetMasterServer/src/main/resources/templates/settings/containers/settingsSecurity.ftl
index 16e50ce68d05c878c21bc8917570403cb352b259..da50bdc1e2dd7529d39a096422b579b961516750 100644
--- a/BudgetMasterServer/src/main/resources/templates/settings/containers/settingsSecurity.ftl
+++ b/BudgetMasterServer/src/main/resources/templates/settings/containers/settingsSecurity.ftl
@@ -6,7 +6,7 @@
<#import "settingsContainer.ftl" as settingsContainerMacros>
<#macro securitySettingsContainer importScripts>
- <@settingsContainerMacros.settingsContainer 'SecuritySettingsContainer' 'securitySettingsContainer' importScripts>
+ <@settingsContainerMacros.settingsContainer 'SecuritySettingsContainer' 'securitySettingsContainer' importScripts '/settings/save/security'>
<#-- password -->
<div class="row">
<div class="input-field col s12 m12 l8 offset-l2">
@@ -27,7 +27,7 @@
<div class="row">
<div class="col s12 center-align">
- <@header.buttonSubmit name='action' icon='save' localizationKey='save' color='background-green' formaction='/settings/save/security'/>
+ <@header.buttonSubmit name='action' icon='save' localizationKey='save' color='background-green'/>
</div>
</div>
diff --git a/BudgetMasterServer/src/main/resources/templates/settings/containers/settingsTransactions.ftl b/BudgetMasterServer/src/main/resources/templates/settings/containers/settingsTransactions.ftl
index 6e26a5c5f1067884702950f0ba111a6e2546a21d..03eae9c4716a25e40d83d197aeef10c1f16f2a0a 100644
--- a/BudgetMasterServer/src/main/resources/templates/settings/containers/settingsTransactions.ftl
+++ b/BudgetMasterServer/src/main/resources/templates/settings/containers/settingsTransactions.ftl
@@ -7,7 +7,7 @@
<#import "../settingsMacros.ftl" as settingsMacros>
<#macro transactionsSettingsContainer importScripts settings>
- <@settingsContainerMacros.settingsContainer 'TransactionsSettingsContainer' 'transactionsSettingsContainer' importScripts>
+ <@settingsContainerMacros.settingsContainer 'TransactionsSettingsContainer' 'transactionsSettingsContainer' importScripts '/settings/save/transactions'>
<div class="row">
<div class="col s12">
<div class="table-container">
@@ -30,7 +30,7 @@
<div class="row">
<div class="col s12 center-align">
- <@header.buttonSubmit name='action' icon='save' localizationKey='save' color='background-green' formaction='/settings/save/transactions'/>
+ <@header.buttonSubmit name='action' icon='save' localizationKey='save' color='background-green'/>
</div>
</div>
diff --git a/BudgetMasterServer/src/main/resources/templates/settings/containers/settingsUpdate.ftl b/BudgetMasterServer/src/main/resources/templates/settings/containers/settingsUpdate.ftl
index eaad0d1bb5984973872088509132cf4ea2aa77d8..c4596a14264310667755ae5d0c595ea57ce1bb92 100644
--- a/BudgetMasterServer/src/main/resources/templates/settings/containers/settingsUpdate.ftl
+++ b/BudgetMasterServer/src/main/resources/templates/settings/containers/settingsUpdate.ftl
@@ -7,7 +7,7 @@
<#import "../settingsMacros.ftl" as settingsMacros>
<#macro updateSettingsContainer importScripts settings>
- <@settingsContainerMacros.settingsContainer 'UpdateSettingsContainer' 'updateSettingsContainer' importScripts>
+ <@settingsContainerMacros.settingsContainer 'UpdateSettingsContainer' 'updateSettingsContainer' importScripts '/settings/save/update'>
<div class="row">
<div class="col s12 m12 l8 offset-l2 center-align">
<div class="table-container">
@@ -74,7 +74,7 @@
<div class="row">
<div class="col s12 center-align">
- <@header.buttonSubmit name='action' icon='save' localizationKey='save' color='background-green' formaction='/settings/save/update'/>
+ <@header.buttonSubmit name='action' icon='save' localizationKey='save' color='background-green'/>
</div>
</div>
diff --git a/BudgetMasterServer/src/main/resources/templates/settings/settingsMacros.ftl b/BudgetMasterServer/src/main/resources/templates/settings/settingsMacros.ftl
index c85e942bf5ff54c55bfb8019af3fc0e6e6cde9b4..7688b5733ad2108c700265445005c61324e1d073 100644
--- a/BudgetMasterServer/src/main/resources/templates/settings/settingsMacros.ftl
+++ b/BudgetMasterServer/src/main/resources/templates/settings/settingsMacros.ftl
@@ -291,13 +291,12 @@
<a target="_blank" href="${locale.getString("settings.backup.auto.strategy.git.remote.help.url")}" class="waves-effect waves-light btn btn-flat text-default"><i class="material-icons left">help_outline</i>${locale.getString("settings.backup.auto.strategy.git.remote.help")}</a>
</div>
</div>
-<#-- TODO -->
-<#-- <div class="row">-->
-<#-- <div class="col s12 m12 l8 offset-l2 center-align">-->
-<#-- <input id="runBackupInput" type="hidden" name="runBackup" value="0">-->
-<#-- <@header.buttonSubmit id='settings-backup-run-now' name='action' icon='cloud_download' localizationKey='settings.backup.auto.run.now' formaction='/settings/save/backup'/>-->
-<#-- </div>-->
-<#-- </div>-->
+ <div class="row">
+ <div class="col s12 m12 l8 offset-l2 center-align">
+ <input id="runBackupInput" type="hidden" name="runBackup" value="0">
+ <@header.buttonSubmit id='settings-backup-run-now' name='action' icon='cloud_download' localizationKey='settings.backup.auto.run.now'/>
+ </div>
+ </div>
</#macro>
<#macro settingsCollapsibleItem id icon title isFontAwesomeIcon=false>