From b75177292e10a7c2bf180c12e8ff00811da02d1f Mon Sep 17 00:00:00 2001
From: DyCTaTOR <125912249+DyCTaTOR@users.noreply.github.com>
Date: Sun, 2 Jun 2024 16:27:38 +0400
Subject: [PATCH] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=B0=D1=8F=204?=
 =?UTF-8?q?=20=D0=BB=D0=B0=D0=B1=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data.mv.db                                    | Bin 1826816 -> 1875968 bytes
 .../example/demo/news/api/NewsController.java |   4 +--
 src/main/resources/templates/news.html        |  34 +++++++++---------
 3 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/data.mv.db b/data.mv.db
index 1af03ea2ba7444af53f35a9a6bc4a810245929e3..2b06d1be45903ca8862d95e1a50ff272c9052213 100644
GIT binary patch
delta 13990
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

delta 6326
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

diff --git a/src/main/java/com/example/demo/news/api/NewsController.java b/src/main/java/com/example/demo/news/api/NewsController.java
index 663512b..c1aa97d 100644
--- a/src/main/java/com/example/demo/news/api/NewsController.java
+++ b/src/main/java/com/example/demo/news/api/NewsController.java
@@ -74,11 +74,11 @@ public class NewsController {
         model.addAllAttributes(attributes);
         model.addAttribute(PAGE_ATTRIBUTE, page);
         model.addAttribute(DESCRIPTION_ATTRIBUTE, description);
-        model.addAttribute("departmentId", departmentId);
-        model.addAttribute(DEPARTMENT_ATTRIBUTE, getDepartment(departmentId));
         if(departmentId != null){
+            model.addAttribute("departmentId", departmentId);
             model.addAttribute(DEPARTMENT_ITEM_ATTRIBUTE, departmentService.get(departmentId));
         }
+        model.addAttribute(DEPARTMENT_ATTRIBUTE, getDepartments());
         return NEWS_VIEW;
     }
 
diff --git a/src/main/resources/templates/news.html b/src/main/resources/templates/news.html
index b3cd8d6..7851649 100644
--- a/src/main/resources/templates/news.html
+++ b/src/main/resources/templates/news.html
@@ -21,23 +21,21 @@
                         <i class="fa fa-search">Поиск</i>
                     </button>
                 </div>
-            </form>
-        </div>
-        <div class="d-flex justify-content-center">
-            <form class="w-25 mt-2" method="get">
-                <div class="input-group">
-                    <label for="departmentId" class="form-label"></label>
-                    <select id="departmentId" class="form-control" name="departmentId">
-                        <option th:if="${departmentId} == null" value="">Выберите кафедру</option>
-                        <option th:unless="${departmentId} == null" th:value="${departmentId}"
-                            th:text="${department.name}" />
-                        <option th:each="departmentItem : ${departments}" th:value="${departmentItem.id}"
-                            th:text="${departmentItem.name}" th:selected="${departmentId} == ${departmentItem.id}">
-                        </option>
-                    </select>
-                    <button class="btn btn-primary" type="submit">
-                        <i class="fa fa-check">Выбрать</i>
-                    </button>
+                <div class="input-group d-flex justify-content-center">
+                    <div class="input-group-append">
+                        <label for="departmentId" class="form-label" />
+                        <select id="departmentId" class="form-control" name="departmentId">
+                            <option th:if="${departmentId} == null" value="" selected>Без фильтра</option>
+                            <option th:each="departmentItem : ${departments}" th:value="${departmentItem.id}"
+                                th:text="${departmentItem.name}" th:selected="${departmentId} == ${departmentItem.id}">
+                            </option>
+                        </select>
+                    </div>
+                    <div class="input-group-append">
+                        <button class="btn btn-primary" type="submit">
+                            <i class="fa fa-check">Выбрать</i>
+                        </button>
+                    </div>
                 </div>
             </form>
         </div>
@@ -45,7 +43,7 @@
             <h2 th:case="0">Данные отсутствуют</h2>
             <th:block th:case="*">
                 <div>
-                    <a href="/news/edit/(page=${page})" class="btn btn-danger mt-4">Добавить новость</a>
+                    <a th:href="@{/news/edit/(page=${page})}" class="btn btn-danger mt-4">Добавить новость</a>
                 </div>
                 <div class="row">
                     <div class="col mt-4 colStyle" th:each="newItem : ${items}">