garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

Merge pull request #388 from Murray65536/master

Browse Source 
Choose reading order when using 'next' page
This commit is contained in:
Athou
2013-07-02 22:03:06 -07:00
parent 89c4232742 d403390664
commit 55d342861f
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/commafeed/frontend/pages/NextUnreadRedirectPage.java Normal file → Executable file
View File

@@ -27,6 +27,7 @@ import com.google.common.collect.Iterables;
public class NextUnreadRedirectPage extends WebPage {
public static final String PARAM_CATEGORYID = "category";
public static final String PARAM_READINGORDER = "order";
@Inject
FeedCategoryDAO feedCategoryDAO;
@@ -36,13 +37,19 @@ public class NextUnreadRedirectPage extends WebPage {
public NextUnreadRedirectPage(PageParameters params) {
String categoryId = params.get(PARAM_CATEGORYID).toString();
String orderParam = params.get(PARAM_READINGORDER).toString();
User user = CommaFeedSession.get().getUser();
ReadingOrder order = ReadingOrder.desc;
if (!StringUtils.isBlank(orderParam) && orderParam.equals("asc")) {
order = ReadingOrder.asc;
}
List<FeedEntryStatus> statuses = null;
if (StringUtils.isBlank(categoryId)
|| CategoryREST.ALL.equals(categoryId)) {
statuses = feedEntryStatusDAO.findAllUnread(user, null, 0, 1,
ReadingOrder.desc, true);
order, true);
} else {
FeedCategory category = feedCategoryDAO.findById(user,
Long.valueOf(categoryId));
@@ -50,7 +57,7 @@ public class NextUnreadRedirectPage extends WebPage {
List<FeedCategory> children = feedCategoryDAO
.findAllChildrenCategories(user, category);
statuses = feedEntryStatusDAO.findUnreadByCategories(children,
null, 0, 1, ReadingOrder.desc, true);
null, 0, 1, order, true);
}
}