From 9d69f75530618750de2db7a38aa8c91c00e783ec Mon Sep 17 00:00:00 2001 From: Nightblade73 Date: Thu, 4 Apr 2019 20:26:38 +0400 Subject: [PATCH] #55 fixes --- .../conference/controller/ConferenceController.java | 6 +++--- .../ulstu/conference/model/ConferenceFilterDto.java | 12 ++++++------ .../resources/templates/conferences/conferences.html | 6 ++++-- .../conferences/fragments/confLineFragment.html | 5 ++--- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/main/java/ru/ulstu/conference/controller/ConferenceController.java b/src/main/java/ru/ulstu/conference/controller/ConferenceController.java index 167be2a..153bd28 100644 --- a/src/main/java/ru/ulstu/conference/controller/ConferenceController.java +++ b/src/main/java/ru/ulstu/conference/controller/ConferenceController.java @@ -20,8 +20,8 @@ public class ConferenceController { this.conferenceService = paperService; } - @GetMapping("/papers") - public void getPapers(ModelMap modelMap) { - modelMap.put("filteredPapers", new ConferenceFilterDto(conferenceService.findAllDto(), null, null)); + @GetMapping("/conferences") + public void getConferences(ModelMap modelMap) { + modelMap.put("filteredConferences", new ConferenceFilterDto(conferenceService.findAllDto(), null, null)); } } diff --git a/src/main/java/ru/ulstu/conference/model/ConferenceFilterDto.java b/src/main/java/ru/ulstu/conference/model/ConferenceFilterDto.java index c2447e9..5b85839 100644 --- a/src/main/java/ru/ulstu/conference/model/ConferenceFilterDto.java +++ b/src/main/java/ru/ulstu/conference/model/ConferenceFilterDto.java @@ -4,7 +4,7 @@ import java.util.List; public class ConferenceFilterDto { - private List papers; + private List conferences; private Integer filterAuthorId; private Integer year; @@ -12,17 +12,17 @@ public class ConferenceFilterDto { } public ConferenceFilterDto(List conferenceDtos, Integer filterAuthorId, Integer year) { - this.papers = conferenceDtos; + this.conferences = conferenceDtos; this.filterAuthorId = filterAuthorId; this.year = year; } - public List getPapers() { - return papers; + public List getConferences() { + return conferences; } - public void setPapers(List papers) { - this.papers = papers; + public void setConferences(List conferences) { + this.conferences = conferences; } public Integer getFilterAuthorId() { diff --git a/src/main/resources/templates/conferences/conferences.html b/src/main/resources/templates/conferences/conferences.html index c725f2b..fa88aaf 100644 --- a/src/main/resources/templates/conferences/conferences.html +++ b/src/main/resources/templates/conferences/conferences.html @@ -7,7 +7,7 @@
-
+
@@ -19,7 +19,9 @@
- + +
+
diff --git a/src/main/resources/templates/conferences/fragments/confLineFragment.html b/src/main/resources/templates/conferences/fragments/confLineFragment.html index f54a777..c97dfbd 100644 --- a/src/main/resources/templates/conferences/fragments/confLineFragment.html +++ b/src/main/resources/templates/conferences/fragments/confLineFragment.html @@ -6,9 +6,8 @@
- - - + +