Skip to content

Avoid Thymeleaf 3.1+ Forbidden Method Calls by Precomputing Class Simple Names #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kristijanzafirovski wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Avoid Thymeleaf 3.1+ Forbidden Method Calls by Precomputing Class Simple Names #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f6817d
Merge pull request #50 from the-mars-rover/main
aileftech Oct 24, 2024
b2e89fc
Merge remote-tracking branch 'origin/main'
kristijanzafirovski May 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/main/java/tech/ailef/snapadmin/external/dbmapping/DbObjectSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,10 @@ public SnapAdmin getSnapAdmin() {
public Class<?> getJavaClass() {
return entityClass;
}


public String getJavaClassSimpleName(){
return entityClass.getSimpleName();
}
/**
* Returns the name of the Java class for the underlying `@Entity` this schema
* corresponds to
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/templates/snapadmin/model/create.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ <h1 class="fw-bold mb-4">
<span class="align-middle"><a th:href="|/${snapadmin_baseUrl}|">Entities </a></span>
<i class="align-middle bi bi-chevron-double-right"></i>
<a class="align-middle" th:href="|/${snapadmin_baseUrl}/model/${schema.getJavaClass().getName()}|">
[[ ${schema.getJavaClass().getSimpleName()} ]] </a>
[[ ${schema.javaClassSimpleName} ]] </a>
<i class="align-middle bi bi-chevron-double-right"></i>
<span class="align-middle" th:text="${create ? 'Create' : 'Edit'}"></span>
<th:block th:if="${!create}">
Expand All @@ -27,7 +27,7 @@ <h1 class="fw-bold mb-4">
<div class="row mt-4">
<div class="col">
<div class="box">
<h3 class="fw-bold mb-4" th:text="${create ? schema.getJavaClass().getSimpleName() : object.getDisplayName()}"></h3>
<h3 class="fw-bold mb-4" th:text="${create ? schema.javaClassSimpleName : object.getDisplayName()}"></h3>
<form class="form" enctype="multipart/form-data" method="post" th:action="|/${snapadmin_baseUrl}/model/${className}/create|">
<input type="hidden" name="__snapadmin_create" th:value="${create}">
<div th:each="field : ${schema.getSortedFields(false)}" class="mt-2"
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/templates/snapadmin/model/list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ <h5 class="fw-bold mt-3">Export format</h3>
<h1 class="fw-bold mb-4"><i class="align-middle bi bi-database"></i>
<span class="align-middle"><a th:href="|/${snapadmin_baseUrl}|">Entities</a></span>
<i class="align-middle bi bi-chevron-double-right"></i>
<span class="align-middle"> [[ ${schema.getJavaClass().getSimpleName()} ]] </span>
<span class="align-middle"> [[ ${schema.getJavaClassSimpleName} ]] </span>
</h1>
<div class="row mt-4">
<div th:class="${schema.getFilterableFields().isEmpty() ? 'col' : 'col-9'}">
Expand Down Expand Up @@ -147,7 +147,7 @@ <h1 class="fw-bold mb-4"><i class="align-middle bi bi-database"></i>


<h3 class="fw-bold mb-4 align-baseline flex-grow-1">
<span title="Java class name"> [[ ${schema.getJavaClass().getSimpleName()} ]] </span>
<span title="Java class name"> [[ ${schema.javaClassSimpleName} ]] </span>
<span title="Database table name" class="ms-3 label label-primary label-gray font-monospace">
[[ ${schema.getTableName()} ]]
</span>
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/templates/snapadmin/model/schema.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<h1 class="fw-bold mb-4"><i class="bi bi-database"></i>
<a class="align-middle" th:href="|/${snapadmin_baseUrl}|">Entities</a>
<i class="align-middle bi bi-chevron-double-right"></i>
<a class="align-middle" th:href="|/${snapadmin_baseUrl}/model/${schema.getJavaClass().getName()}|"> [[ ${schema.getJavaClass().getSimpleName()} ]]</a>
<a class="align-middle" th:href="|/${snapadmin_baseUrl}/model/${schema.getJavaClass().getName()}|"> [[ ${schema.javaClassSimpleName } ]]</a>
<i class="align-middle bi bi-chevron-double-right"></i><span class="align-middle"> Schema</span>
</h1>
<div class="row mt-4">
Expand All @@ -34,7 +34,7 @@ <h1 class="fw-bold mb-4"><i class="bi bi-database"></i>
<div class="box with-navigation">
<div class="d-flex justify-content-between">
<h3 class="fw-bold align-baseline">
<span title="Java class name"> [[ ${schema.getJavaClass().getSimpleName()} ]] </span>
<span title="Java class name"> [[ ${schema.javaClassSimpleName} ]] </span>
<span title="Database table name" class="ms-3 label label-primary label-gray font-monospace">
[[ ${schema.getTableName()} ]]
</span>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/snapadmin/model/show.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ <h1 class="fw-bold mb-4"><i class="align-middle bi bi-database"></i>
<a class="align-middle" th:href="|/${snapadmin_baseUrl}|">Entities</a>
<i class="align-middle bi bi-chevron-double-right"></i>
<a class="align-middle" th:href="|/${snapadmin_baseUrl}/model/${schema.getJavaClass().getName()}|">
[[ ${schema.getJavaClass().getSimpleName()} ]]</a>
[[ ${schema.javaClassSimpleName } ]]</a>
<i class="align-middle bi bi-chevron-double-right"></i>
<span class="align-middle"> [[ ${object.getDisplayName()} ]]</span>
</h1>
Expand Down