From 5c521609d88dc0a3b28e4849b8efadedc4a8b07f Mon Sep 17 00:00:00 2001 From: Francesco Date: Thu, 21 Sep 2023 15:01:31 +0200 Subject: [PATCH] WIP --- .../controller/DefaultDbAdminController.java | 14 +++++++------- .../dbadmin/controller/DownloadController.java | 2 +- .../rest/AutocompleteController.java | 2 +- .../rest/DefaultDbAdminRestController.java | 2 +- .../templates/fragments/data_row.html | 12 ++++++------ .../templates/fragments/resources.html | 18 +++++++++--------- .../templates/fragments/table_selectable.html | 8 ++++---- src/main/resources/templates/home.html | 8 ++++---- src/main/resources/templates/model/create.html | 10 +++++----- src/main/resources/templates/model/list.html | 10 +++++----- src/main/resources/templates/model/schema.html | 10 +++++----- src/main/resources/templates/model/show.html | 6 +++--- src/main/resources/templates/settings.html | 2 +- 13 files changed, 52 insertions(+), 52 deletions(-) diff --git a/src/main/java/tech/ailef/dbadmin/controller/DefaultDbAdminController.java b/src/main/java/tech/ailef/dbadmin/controller/DefaultDbAdminController.java index d82c314..f58c318 100644 --- a/src/main/java/tech/ailef/dbadmin/controller/DefaultDbAdminController.java +++ b/src/main/java/tech/ailef/dbadmin/controller/DefaultDbAdminController.java @@ -43,7 +43,7 @@ import tech.ailef.dbadmin.misc.Utils; * The main DbAdmin controller that register most of the routes of the web interface. */ @Controller -@RequestMapping(value= {"/${dbadmin.baseUrl}", "/${dbadmin.baseUrl}/"}, method=RequestMethod.GET) +@RequestMapping(value= {"/${dbadmin.baseUrl}", "/${dbadmin.baseUrl}/"}) public class DefaultDbAdminController { @Autowired private DbAdminProperties properties; @@ -168,7 +168,7 @@ public class DefaultDbAdminController { return "model/list"; } catch (InvalidPageException e) { - return "redirect:/dbadmin/model/" + className; + return "redirect:/" + properties.getBaseUrl() + "/model/" + className; } } @@ -265,7 +265,7 @@ public class DefaultDbAdminController { attr.addFlashAttribute("error", e.getMessage()); } - return "redirect:/dbadmin/model/" + className; + return "redirect:/" + properties.getBaseUrl() + "/model/" + className; } @PostMapping(value="/model/{className}/delete") @@ -292,7 +292,7 @@ public class DefaultDbAdminController { if (countDeleted > 0) attr.addFlashAttribute("message", "Deleted " + countDeleted + " of " + ids.length + " items"); - return "redirect:/dbadmin/model/" + className; + return "redirect:/" + properties.getBaseUrl() + "/model/" + className; } @PostMapping(value="/model/{className}/create") @@ -402,11 +402,11 @@ public class DefaultDbAdminController { if (attr.getFlashAttributes().containsKey("error")) { if (create) - return "redirect:/dbadmin/model/" + schema.getClassName() + "/create"; + return "redirect:/" + properties.getBaseUrl() + "/model/" + schema.getClassName() + "/create"; else - return "redirect:/dbadmin/model/" + schema.getClassName() + "/edit/" + pkValue; + return "redirect:/" + properties.getBaseUrl() + "/model/" + schema.getClassName() + "/edit/" + pkValue; } else { - return "redirect:/dbadmin/model/" + schema.getClassName() + "/show/" + pkValue; + return "redirect:/" + properties.getBaseUrl() + "/model/" + schema.getClassName() + "/show/" + pkValue; } } diff --git a/src/main/java/tech/ailef/dbadmin/controller/DownloadController.java b/src/main/java/tech/ailef/dbadmin/controller/DownloadController.java index 7542cc0..aef8b27 100644 --- a/src/main/java/tech/ailef/dbadmin/controller/DownloadController.java +++ b/src/main/java/tech/ailef/dbadmin/controller/DownloadController.java @@ -28,7 +28,7 @@ import tech.ailef.dbadmin.exceptions.DbAdminException; * Controller to serve file or images (`@DisplayImage`) */ @Controller -@RequestMapping("/dbadmin/download") +@RequestMapping(value = {"/${dbadmin.baseUrl}/download", "/${dbadmin.baseUrl}/download/"}) public class DownloadController { @Autowired private DbAdminRepository repository; diff --git a/src/main/java/tech/ailef/dbadmin/controller/rest/AutocompleteController.java b/src/main/java/tech/ailef/dbadmin/controller/rest/AutocompleteController.java index b39d19b..a1e2f6f 100644 --- a/src/main/java/tech/ailef/dbadmin/controller/rest/AutocompleteController.java +++ b/src/main/java/tech/ailef/dbadmin/controller/rest/AutocompleteController.java @@ -20,7 +20,7 @@ import tech.ailef.dbadmin.dto.AutocompleteSearchResult; * API controller for autocomplete results */ @RestController -@RequestMapping("/dbadmin/api/autocomplete") +@RequestMapping(value= {"/${dbadmin.baseUrl}/api/autocomplete", "/${dbadmin.baseUrl}/api/autocomplete/"}) public class AutocompleteController { @Autowired private DbAdmin dbAdmin; diff --git a/src/main/java/tech/ailef/dbadmin/controller/rest/DefaultDbAdminRestController.java b/src/main/java/tech/ailef/dbadmin/controller/rest/DefaultDbAdminRestController.java index 308eae5..a14bccb 100644 --- a/src/main/java/tech/ailef/dbadmin/controller/rest/DefaultDbAdminRestController.java +++ b/src/main/java/tech/ailef/dbadmin/controller/rest/DefaultDbAdminRestController.java @@ -19,7 +19,7 @@ import tech.ailef.dbadmin.dto.PaginatedResult; import tech.ailef.dbadmin.exceptions.DbAdminException; @RestController -@RequestMapping("/dbadmin/api") +@RequestMapping(value = {"/${dbadmin.baseUrl}/api", "/${dbadmin.baseUrl}/api/"}) public class DefaultDbAdminRestController { @Autowired public DbAdmin dbAdmin; diff --git a/src/main/resources/templates/fragments/data_row.html b/src/main/resources/templates/fragments/data_row.html index b9b22cb..a62978d 100644 --- a/src/main/resources/templates/fragments/data_row.html +++ b/src/main/resources/templates/fragments/data_row.html @@ -8,10 +8,10 @@ th:value="${row.getPrimaryKeyValue()}" form="multi-delete-form"> - +
+ th:action="|/${baseUrl}/model/${schema.getJavaClass().getName()}/delete/${row.getPrimaryKeyValue()}|">
@@ -34,7 +34,7 @@ - +

- + @@ -63,11 +63,11 @@

+ th:src="|/${baseUrl}/download/${schema.getClassName()}/${field.getJavaName()}/${object.getPrimaryKeyValue()}/image|">
+ th:href="|/${baseUrl}/download/${schema.getClassName()}/${field.getJavaName()}/${object.getPrimaryKeyValue()}|"> Download ([[ ${object.get(field).getValue().length} ]] bytes) diff --git a/src/main/resources/templates/fragments/resources.html b/src/main/resources/templates/fragments/resources.html index fbfca31..023ed50 100644 --- a/src/main/resources/templates/fragments/resources.html +++ b/src/main/resources/templates/fragments/resources.html @@ -38,7 +38,7 @@
MENU