7 Commits

3 changed files with 9 additions and 2 deletions

View File

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

View File

@@ -141,6 +141,10 @@ 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;
} }

View File

@@ -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"