From 30120ca18dd616edd60d4f804bacce0ae1314036 Mon Sep 17 00:00:00 2001 From: Zyzf Date: Fri, 12 May 2023 17:56:22 +0400 Subject: [PATCH] computers in cabinets fix --- .../controller/CabinetMvcController.java | 4 ++++ .../resources/templates/cabinet-edit.html | 23 ++++++++++--------- src/main/resources/templates/index.html | 1 + 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/kalyshev/yan/cabinet/controller/CabinetMvcController.java b/src/main/java/com/kalyshev/yan/cabinet/controller/CabinetMvcController.java index ae47a47..097e4b2 100644 --- a/src/main/java/com/kalyshev/yan/cabinet/controller/CabinetMvcController.java +++ b/src/main/java/com/kalyshev/yan/cabinet/controller/CabinetMvcController.java @@ -41,6 +41,10 @@ public class CabinetMvcController { computerService.findFilteredComputers(null, null, null, null, id).stream() .map(ComputerDto::new) .toList()); + model.addAttribute("allComputers", + computerService.findAllComputers().stream() + .map(ComputerDto::new) + .toList()); return "cabinet-edit"; } @PostMapping(value = {"", "/{id}"}) diff --git a/src/main/resources/templates/cabinet-edit.html b/src/main/resources/templates/cabinet-edit.html index 5521e00..7a4ffa7 100644 --- a/src/main/resources/templates/cabinet-edit.html +++ b/src/main/resources/templates/cabinet-edit.html @@ -12,7 +12,7 @@ -
+
@@ -46,22 +46,23 @@
-
- - - Назад - +
+ + + Назад + +
-
+
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index d52de28..14d1922 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -3,6 +3,7 @@ xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{default}"> + Сайт