2026_09_5H_Spring_KIZAKI/Monegement
16
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'k-kobayashi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into s-morimto

Browse Source
This commit is contained in:
[IIJ] Seidai Morimoto
2026-09-25 13:17:12 +09:00
parent 0c54a42b97 6fda1af754
commit 3b239d07bd
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/example/demo/app/presentation/controller/PasswordResetController.java
View File

@@ -52,7 +52,7 @@ public class PasswordResetController {
System.out.println("isReset=" + isReset); System.out.println("isReset=" + isReset);
if(!isReset) { if(!isReset) {
model.addAttribute("Message", "パスワードが一致しません。"); model.addAttribute("message", "パスワードが一致しません。");
return "password_reset"; return "password_reset";
} }

4
src/main/resources/templates/select_course.html
View File

@@ -14,7 +14,7 @@
<form th:action="${mode == 'regist'} ? @{/user/register/return}: @{/change}" method="post"> <form th:action="${mode == 'regist'} ? @{/user/register/return}: @{/change}" method="post">
<button type="submit" class="btn btn-primary">確定</button> <button type="submit" class="btn btn-primary w-100">確定</button>
<div class="accordion" id="accordionExample"> <div class="accordion" id="accordionExample">
<div class="accordion-item" th:each="course:${courseList}"> <div class="accordion-item" th:each="course:${courseList}">
@@ -27,7 +27,7 @@
<div th:id="'collapse' + ${course.courseId}" class="accordion-collapse collapse" data-bs-parent="#accordionExample"> <div th:id="'collapse' + ${course.courseId}" class="accordion-collapse collapse" data-bs-parent="#accordionExample">
<div class="accordion-body"> <div class="accordion-body">
<span th:text="${course.description}"></span> <span th:text="${course.description}"></span>
<table border="1"> <table class="table table-bordered">
<tr> <tr>
<th>カテゴリ名</th><th>配分(%)</th> <th>カテゴリ名</th><th>配分(%)</th>
</tr> </tr>