From 43547216f2e0a899062cbd0ae4d085f1bacd63d7 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Sat, 3 Jun 2017 13:20:25 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B2=D1=8B=D0=B9=20=D0=B2?= =?UTF-8?q?=D0=B0=D1=80=D0=B8=D0=B0=D0=BD=D1=82=20"=D0=BF=D0=B0=D0=B3?= =?UTF-8?q?=D0=B8=D0=BD=D0=B0=D1=86=D0=B8=D0=B8"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kinosearch/kinosearch3/webpp/WebAppController.java | 8 ++++++-- .../kinosearch/kinosearch3/webpp/searchResult.ftl | 4 ++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/kinosearch/kinosearch3/webpp/WebAppController.java b/src/main/java/kinosearch/kinosearch3/webpp/WebAppController.java index 165561f..4b0af2a 100644 --- a/src/main/java/kinosearch/kinosearch3/webpp/WebAppController.java +++ b/src/main/java/kinosearch/kinosearch3/webpp/WebAppController.java @@ -42,13 +42,17 @@ public class WebAppController { } @RequestMapping(value = "/", method = RequestMethod.GET, params = {"search"}) - public String search(@RequestParam("search") String searchText, Model model) { + public String search( + @RequestParam("search") String searchText, + @RequestParam(value = "page", defaultValue = "1", required = false) int page, + Model model) { if (searchText.trim().isEmpty()) { return "redirect:/"; } - List cinemaDocuments = baseRepository.findByTitle(searchText.trim(), 1); + List cinemaDocuments = baseRepository.findByTitle(searchText.trim(), page); model.addAttribute("cindocs", cinemaDocuments); model.addAttribute("searchText", searchText); + model.addAttribute("page", page); return "searchResult"; } diff --git a/src/main/resources/kinosearch/kinosearch3/webpp/searchResult.ftl b/src/main/resources/kinosearch/kinosearch3/webpp/searchResult.ftl index ae37c21..95e871f 100644 --- a/src/main/resources/kinosearch/kinosearch3/webpp/searchResult.ftl +++ b/src/main/resources/kinosearch/kinosearch3/webpp/searchResult.ftl @@ -24,6 +24,10 @@ [/#list] + [#else]
Ничего не найдено