Mercurial > hg > LGServices
diff src/main/java/de/mpiwg/web/jsp/BooksPage.java @ 78:141fa833d126
Bug fixed : Display columns named "source"
author | Calvin Yeh <cyeh@mpiwg-berlin.mpg.de> |
---|---|
date | Wed, 03 May 2017 19:53:16 +0200 |
parents | e5697f7775b2 |
children | 85e27da9b18a |
line wrap: on
line diff
--- a/src/main/java/de/mpiwg/web/jsp/BooksPage.java Wed May 03 19:51:43 2017 +0200 +++ b/src/main/java/de/mpiwg/web/jsp/BooksPage.java Wed May 03 19:53:16 2017 +0200 @@ -28,6 +28,8 @@ import de.mpiwg.web.books.SortBooksByPeriod; import de.mpiwg.web.books.SortBooksByStartYear; import de.mpiwg.web.books.SortBooksByTocCorrection; +import de.mpiwg.web.books.SortBooksByYear; +import de.mpiwg.web.books.SortBooksBySource; public class BooksPage extends AbstractJSPPage{ @@ -101,7 +103,7 @@ (StringUtils.isEmpty(bookNameFilter) || StringUtils.contains(book.getName(), bookNameFilter)) && (StringUtils.isEmpty(dynastyFilter) || StringUtils.contains(book.getDynasty(), dynastyFilter)) && (StringUtils.isEmpty(adminTypeFilter) || StringUtils.contains(book.getAdmin_type(), adminTypeFilter)) && - (StringUtils.isEmpty(yearFilter) || StringUtils.contains(book.getYear(), yearFilter)) && + (StringUtils.isEmpty(yearFilter) || book.getYear() == Integer.parseInt(yearFilter)) && (StringUtils.isEmpty(sourceFilter) || StringUtils.contains(book.getSource(), sourceFilter)) ){ String lastEditor = new String(); @@ -211,7 +213,7 @@ } public String getSourceFilter() { - return yearFilter; + return sourceFilter; }