Compare commits
3 Commits
181adcd933
...
26c9be6f71
| Author | SHA1 | Date | |
|---|---|---|---|
| 26c9be6f71 | |||
|
|
c470cc1970 | ||
|
|
edadbf86ec |
@@ -133,6 +133,8 @@ public class CourseServiceImpl implements CourseService {
|
|||||||
System.out.println("***********************ここでエラー1");
|
System.out.println("***********************ここでエラー1");
|
||||||
if (userEntity.getCourseEntity().getCourseId() == courseId) {
|
if (userEntity.getCourseEntity().getCourseId() == courseId) {
|
||||||
return "selected";
|
return "selected";
|
||||||
|
} else if (courseId <= 6) {
|
||||||
|
return "original";
|
||||||
}
|
}
|
||||||
System.out.println("***********************ここでエラー2");
|
System.out.println("***********************ここでエラー2");
|
||||||
allocationRepository.deleteByCourseId(courseId);
|
allocationRepository.deleteByCourseId(courseId);
|
||||||
|
|||||||
@@ -141,9 +141,13 @@ public class CourseController {
|
|||||||
|
|
||||||
return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.COURSE;
|
return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.COURSE;
|
||||||
|
|
||||||
|
} else if (condition.equals("original")) {
|
||||||
|
model.addAttribute("message", "既存のデータは削除できません");
|
||||||
|
|
||||||
|
return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.COURSE;
|
||||||
} else if (condition.equals("ok")) {
|
} else if (condition.equals("ok")) {
|
||||||
return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.COURSE;
|
return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.COURSE;
|
||||||
}
|
}
|
||||||
model.addAttribute("message", "エラーが発生しました");
|
model.addAttribute("message", "エラーが発生しました");
|
||||||
|
|
||||||
return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.COURSE;
|
return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.COURSE;
|
||||||
|
|||||||
@@ -36,7 +36,8 @@
|
|||||||
aria-controls="'collapse' + ${course.courseId}">
|
aria-controls="'collapse' + ${course.courseId}">
|
||||||
<span th:text="${course.courseName}"></span>
|
<span th:text="${course.courseName}"></span>
|
||||||
</button>
|
</button>
|
||||||
<p style="width: 120px;"><button type="button" class="btn btn-danger w-100"
|
|
||||||
|
<p th:if="${course.courseId > 6}" style="width: 120px;"><button type="button" class="btn btn-danger w-100"
|
||||||
th:attr="data-course-id=${course.courseId}" onclick="deleteCourse(this)">削除</button></p>
|
th:attr="data-course-id=${course.courseId}" onclick="deleteCourse(this)">削除</button></p>
|
||||||
</h2>
|
</h2>
|
||||||
<div th:id="'collapse' + ${course.courseId}" class="accordion-collapse collapse"
|
<div th:id="'collapse' + ${course.courseId}" class="accordion-collapse collapse"
|
||||||
|
|||||||
Reference in New Issue
Block a user