From 4fa5c46b54d2def5cc4dc186176b00f07b9174d4 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sun, 17 Apr 2022 21:27:20 +0200
Subject: [PATCH] #663 - refactor: moved migration page to own package

---
 .../src/main/resources/application.properties             | 2 +-
 .../budgetmaster/migration/MigrationController.java       | 2 +-
 .../resources/templates/{ => migration}/migration.ftl     | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename BudgetMasterServer/src/main/resources/templates/{ => migration}/migration.ftl (97%)

diff --git a/BudgetMasterDatabaseMigrator/src/main/resources/application.properties b/BudgetMasterDatabaseMigrator/src/main/resources/application.properties
index 9af59ce8b..8f534251f 100644
--- a/BudgetMasterDatabaseMigrator/src/main/resources/application.properties
+++ b/BudgetMasterDatabaseMigrator/src/main/resources/application.properties
@@ -10,7 +10,7 @@ spring.datasource.driver-class-name=org.h2.Driver
 spring.seconddatasource.driver-class-name=org.postgresql.Driver
 
 spring.jpa.database=default
-spring.jpa.show-sql=true
+spring.jpa.show-sql=false
 spring.jpa.generate-ddl=true
 spring.jpa.hibernate.ddl-auto=update
 
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/migration/MigrationController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/migration/MigrationController.java
index e54884719..6887159e4 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/migration/MigrationController.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/migration/MigrationController.java
@@ -34,7 +34,7 @@ public class MigrationController extends BaseController
 
 	private static class ReturnValues
 	{
-		public static final String MIGRATION_SETTINGS = "migration";
+		public static final String MIGRATION_SETTINGS = "migration/migration";
 	}
 
 	private final MigrationService migrationService;
diff --git a/BudgetMasterServer/src/main/resources/templates/migration.ftl b/BudgetMasterServer/src/main/resources/templates/migration/migration.ftl
similarity index 97%
rename from BudgetMasterServer/src/main/resources/templates/migration.ftl
rename to BudgetMasterServer/src/main/resources/templates/migration/migration.ftl
index b24a95ba0..9a470f388 100644
--- a/BudgetMasterServer/src/main/resources/templates/migration.ftl
+++ b/BudgetMasterServer/src/main/resources/templates/migration/migration.ftl
@@ -1,14 +1,14 @@
 <html>
     <head>
-        <#import "helpers/header.ftl" as header>
+        <#import "../helpers/header.ftl" as header>
         <@header.globals/>
         <@header.header "BudgetMaster - ${locale.getString('title.migration')}"/>
         <#import "/spring.ftl" as s>
     </head>
     <@header.body>
-        <#import "helpers/navbar.ftl" as navbar>
+        <#import "../helpers/navbar.ftl" as navbar>
         <@navbar.navbar "migration" settings/>
-        <#import "helpers/validation.ftl" as validation>
+        <#import "../helpers/validation.ftl" as validation>
 
         <main>
             <div class="card main-card background-color">
@@ -121,7 +121,7 @@
         </main>
 
         <!-- Scripts-->
-        <#import "helpers/scripts.ftl" as scripts>
+        <#import "../helpers/scripts.ftl" as scripts>
         <@scripts.scripts/>
     </@header.body>
 </html>
\ No newline at end of file
-- 
GitLab