From ff9048cefb7d1d92956f07ecc3224f4f4c2ebe95 Mon Sep 17 00:00:00 2001
From: Pekka Helenius <fincer89@hotmail.com>
Date: Fri, 23 Oct 2020 02:55:18 +0300
Subject: [PATCH] Book max count info box: move to the book list page

Signed-off-by: Pekka Helenius <fincer89@hotmail.com>
---
 .../java/com/fjordtek/bookstore/web/BookController.java    | 2 +-
 bookstore/src/main/resources/templates/booklist.html       | 7 ++++++-
 .../src/main/resources/templates/fragments/bookfields.html | 7 +------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bookstore/src/main/java/com/fjordtek/bookstore/web/BookController.java b/bookstore/src/main/java/com/fjordtek/bookstore/web/BookController.java
index 6069a06..c72ec5a 100644
--- a/bookstore/src/main/java/com/fjordtek/bookstore/web/BookController.java
+++ b/bookstore/src/main/java/com/fjordtek/bookstore/web/BookController.java
@@ -229,7 +229,7 @@ public class BookController {
 					+ " " + env.getProperty("security.book.count.max") + "."
 					);
 
-			return "redirect:" + env.getProperty("page.url.add");
+			return "redirect:" + env.getProperty("page.url.list");
 		}
 
 
diff --git a/bookstore/src/main/resources/templates/booklist.html b/bookstore/src/main/resources/templates/booklist.html
index e7bc091..f0e54cb 100644
--- a/bookstore/src/main/resources/templates/booklist.html
+++ b/bookstore/src/main/resources/templates/booklist.html
@@ -245,7 +245,12 @@ Idea of the following syntax used in this and other HTML document:
 			</tr>
 
 		</table>
-		
+
+		<div class="alert alert-danger mt-2" th:if="${bookmaxcount != null}"
+			th:text="${bookmaxcount}">
+			Unable to add more books. Book count limit is X.
+		</div>
+
 		<div sec:authorize="isAnonymous()">
 			<p th:text="${#messages.msgOrNull('page.text.list.anon.info')} ?: 'page.text.list.anon.info'">
 			page.text.list.anon.info
diff --git a/bookstore/src/main/resources/templates/fragments/bookfields.html b/bookstore/src/main/resources/templates/fragments/bookfields.html
index 8a032f3..2069e3f 100644
--- a/bookstore/src/main/resources/templates/fragments/bookfields.html
+++ b/bookstore/src/main/resources/templates/fragments/bookfields.html
@@ -11,12 +11,7 @@
 	<th:block th:fragment="bookfields">
 
 			<div class="bookform-section">
-			
-				<div class="alert alert-danger mt-2" th:if="${bookmaxcount != null}"
-				th:text="${bookmaxcount}">
-				Unable to add more books. Book count limit is X.
-				</div>
-			
+
 				<div>
 					<h3 th:text="${#messages.msgOrNull('book.author')} ?: 'book.author'">
 					book.author