#509 - prevent page reload on requesting a template delete

src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java

@@ -101,8 +101,8 @@ public class TemplateController extends BaseController
 		}
 
 		model.addAttribute("templates", templateService.getAllEntitiesAsc());
-		model.addAttribute("currentTemplate", templateOptional.get());
-		return "templates/templates";
+		model.addAttribute("templateToDelete", templateOptional.get());
+		return "templates/deleteTemplateModal";
 	}
 
 	@GetMapping("/{ID}/delete")

src/main/resources/static/js/templates.js

 $(document).ready(function()
 {
-    if($('#modalConfirmDelete').length)
-    {
-        $('#modalConfirmDelete').modal('open');
-    }
-
     M.Collapsible.init(document.querySelector('.collapsible.expandable'), {
         accordion: false
     });
@@ -39,6 +34,11 @@ $(document).ready(function()
         document.getElementById('searchTemplate').focus();
         enableTemplateHotKeys();
     }
+
+    $('.button-request-delete-template').click(function()
+    {
+        fetchAndShowModalContent(this.dataset.url, '#deleteModalContainerOnDemand', '#modalConfirmDelete', function(){});
+    });
 });
 
 let selectedTemplateName = null;

src/main/resources/templates/templates/deleteTemplateModal.ftl

+<#global locale = static["de.thecodelabs.utils.util.Localization"]>
+<#import "/spring.ftl" as s>
+<#import "../helpers/header.ftl" as header>
+
+<@header.modalConfirmDelete title=locale.getString("info.title.template.delete") confirmUrl='/templates' itemId=templateToDelete.getID() confirmButtonTextKey='info.title.template.delete'>
+    <p>${locale.getString("info.text.template.delete", templateToDelete.getTemplateName())}</p>
+</@header.modalConfirmDelete>
\ No newline at end of file

src/main/resources/templates/templates/templateFunctions.ftl

@@ -26,7 +26,7 @@
                                 <@templateHeader template/>
                                 <div class="collapsible-header-button">
                                     <@header.buttonFlat url='/templates/' + template.ID?c + '/edit' icon='edit' localizationKey='' classes="no-padding text-default"/>
-                                    <@header.buttonFlat url='/templates/' + template.ID?c + '/requestDelete' icon='delete' localizationKey='' classes="no-padding text-default"/>
+                                    <@header.buttonFlat url='/templates/' + template.ID?c + '/requestDelete' icon='delete' localizationKey='' classes="no-padding text-default button-request-delete-template" isDataUrl=true/>
                                     <@header.buttonLink url='/templates/' + template.ID?c + '/select' icon='note_add' localizationKey='' classes='button-select-template'/>
                                 </div>
                             </div>

src/main/resources/templates/templates/templates.ftl

@@ -46,11 +46,7 @@
                 </div>
             </@header.content>
 
-            <#if currentTemplate??>
-                <@header.modalConfirmDelete title=locale.getString("info.title.template.delete") confirmUrl='/templates' cancelUrlBase='/templates' itemId=currentTemplate.getID() confirmButtonTextKey='info.title.template.delete'>
-                    <p>${locale.getString("info.text.template.delete", currentTemplate.getTemplateName())}</p>
-                </@header.modalConfirmDelete>
-            </#if>
+            <div id="deleteModalContainerOnDemand"></div>
         </main>
 
         <#import "../helpers/scripts.ftl" as scripts>