From b4e93f77199acbfb1d9626a9a73039d8d2ce496b Mon Sep 17 00:00:00 2001
From: DyCTaTOR <125912249+DyCTaTOR@users.noreply.github.com>
Date: Wed, 5 Jun 2024 21:30:31 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=BC=D0=B5=D0=B6=D1=83?=
 =?UTF-8?q?=D1=82=D0=BE=D1=87=D0=BD=D0=BE=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data.mv.db                                    | Bin 2322432 -> 2379776 bytes
 .../demo/news/api/NewsAdminController.java    |   7 ++++---
 src/main/resources/templates/departments.html |  13 +++++++------
 src/main/resources/templates/directions.html  |   7 +++----
 src/main/resources/templates/new-edit.html    |   3 ++-
 src/main/resources/templates/users.html       |  12 ++++++------
 6 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/data.mv.db b/data.mv.db
index d29e43cc37842509544b59c866b79289e88a39d0..984f2405ddf4b87716d349c928470cf64767d43a 100644
GIT binary patch
delta 10589
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

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

diff --git a/src/main/java/com/example/demo/news/api/NewsAdminController.java b/src/main/java/com/example/demo/news/api/NewsAdminController.java
index f4f65cf..4b12f4b 100644
--- a/src/main/java/com/example/demo/news/api/NewsAdminController.java
+++ b/src/main/java/com/example/demo/news/api/NewsAdminController.java
@@ -25,6 +25,7 @@ import jakarta.validation.Valid;
 @RequestMapping(NewsAdminController.URL)
 public class NewsAdminController {
     public static final String URL = Constants.ADMIN_PREFIX + "/news";
+    private static final String NEWS_URL = NewsController.URL;
     private static final String NEWS_EDIT_VIEW = "new-edit";
     private static final String NEWS_ATTRIBUTE = "news";
     private static final String DEPARTMENT_ATTRIBUTE = "departments";
@@ -68,14 +69,14 @@ public class NewsAdminController {
             return NEWS_EDIT_VIEW;
         }
         newsService.create(toEntity(newItem));
-        return Constants.REDIRECT_VIEW + URL;
+        return Constants.REDIRECT_VIEW + NEWS_URL;
     }
 
     @PostMapping("/delete/{id}")
     public String delete(
             @PathVariable(name = "id") Long id) {
         newsService.delete(id);
-        return Constants.REDIRECT_VIEW + URL;
+        return Constants.REDIRECT_VIEW + NEWS_URL;
     }
 
     @GetMapping("/edit/{id}")
@@ -103,6 +104,6 @@ public class NewsAdminController {
             throw new IllegalArgumentException();
         }
         newsService.update(id, toEntity(newItem));
-        return Constants.REDIRECT_VIEW + URL;
+        return Constants.REDIRECT_VIEW + NEWS_URL;
     }
 }
diff --git a/src/main/resources/templates/departments.html b/src/main/resources/templates/departments.html
index 0104eb8..d533d73 100644
--- a/src/main/resources/templates/departments.html
+++ b/src/main/resources/templates/departments.html
@@ -9,15 +9,16 @@
 
 <body>
     <main class="text-center" layout:fragment="content">
+        <span class="mainSt">
+            <b>Кафедры</b>
+        </span>
+        <div>
+            <a href="/admin/departments/edit/" class="btn btn-danger">Добавить кафедру</a>
+        </div>
         <th:block th:switch="${departments.size()}">
             <h2 th:case="0">Данные отсутствуют</h2>
             <th:block th:case="*">
-                <span class="mainSt">
-                    <b>Кафедры</b>
-                </span>
-                <div>
-                    <a href="/admin/departments/edit/" class="btn btn-danger">Добавить кафедру</a>
-                </div>
+
                 <table class="table">
                     <caption></caption>
                     <thead>
diff --git a/src/main/resources/templates/directions.html b/src/main/resources/templates/directions.html
index 187f766..4795eea 100644
--- a/src/main/resources/templates/directions.html
+++ b/src/main/resources/templates/directions.html
@@ -23,13 +23,12 @@
                 </div>
             </form>
         </div>
+        <div>
+            <a th:href="@{/admin/directions/edit/(page=${page})}" class="btn btn-danger mt-4">Добавить направление</a>
+        </div>
         <th:block th:switch="${items.size()}">
             <h2 th:case="0">Данные отсутствуют</h2>
             <th:block th:case="*">
-                <div>
-                    <a th:href="@{/admin/directions/edit/(page=${page})}" class="btn btn-danger mt-4">Добавить
-                        направление</a>
-                </div>
                 <table class="table">
                     <caption></caption>
                     <thead>
diff --git a/src/main/resources/templates/new-edit.html b/src/main/resources/templates/new-edit.html
index 0d1abd4..9718d83 100644
--- a/src/main/resources/templates/new-edit.html
+++ b/src/main/resources/templates/new-edit.html
@@ -7,7 +7,8 @@
 
 <body>
     <main layout:fragment="content">
-        <form action="#" th:action="@{/news/edit/{id}(id=${news.id},(page=${page}))}" th:object="${news}" method="post">
+        <form action="#" th:action="@{/admin/news/edit/{id}(id=${news.id},(page=${page}))}" th:object="${news}"
+            method="post">
             <div class="mb-3">
                 <label for="id" class="form-label">ID</label>
                 <input type="text" th:value="*{id}" id="id" class="form-control" readonly disabled>
diff --git a/src/main/resources/templates/users.html b/src/main/resources/templates/users.html
index b3da292..4f4e9fe 100644
--- a/src/main/resources/templates/users.html
+++ b/src/main/resources/templates/users.html
@@ -9,15 +9,15 @@
 
 <body>
     <main class="text-center" layout:fragment="content">
+        <span class="mainSt">
+            <b>Пользователи</b>
+        </span>
+        <div>
+            <a href="/users/edit/" class="btn btn-danger">Добавить пользователя</a>
+        </div>
         <th:block th:switch="${items.size()}">
             <h2 th:case="0">Данные отсутствуют</h2>
             <th:block th:case="*">
-                <span class="mainSt">
-                    <b>Пользователи</b>
-                </span>
-                <div>
-                    <a href="/users/edit/" class="btn btn-danger">Добавить пользователя</a>
-                </div>
                 <table class="table">
                     <caption></caption>
                     <thead>