#663 - refactor: moved migration page to own package

4fa5c46b · Robert Goldmann · 6a0896b8 · 4fa5c46b · 4fa5c46b · 4fa5c46b
Commit 4fa5c46b authored 3 years ago by Robert Goldmann
--- 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


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

--- a/BudgetMasterServer/src/main/resources/templates/migration.ftl
+++ b/BudgetMasterServer/src/main/resources/templates/migration.ftl
 <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