#696 - re-enabled "run backup now" button

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,

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>
 

BudgetMasterServer/src/main/resources/templates/settings/containers/settingsContainer.ftl

 <#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>

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>

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>
 

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>
 

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>
 

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>
 

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>