Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

don't sort when just marking

Browse Source
This commit is contained in:
Athou
2013-06-18 13:48:07 +02:00
parent 0b4f7d68ae
commit 491af8a6df
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java
View File

@@ -295,11 +295,13 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
private void orderBy(CriteriaQuery<FeedEntryStatus> query,
Join<FeedEntryStatus, FeedEntry> entryJoin, ReadingOrder order) {
Path<Date> orderPath = entryJoin.get(FeedEntry_.updated);
if (order == ReadingOrder.asc) {
query.orderBy(builder.asc(orderPath));
} else {
query.orderBy(builder.desc(orderPath));
if (order != null) {
Path<Date> orderPath = entryJoin.get(FeedEntry_.updated);
if (order == ReadingOrder.asc) {
query.orderBy(builder.asc(orderPath));
} else {
query.orderBy(builder.desc(orderPath));
}
}
}
@@ -337,26 +339,24 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
public void markSubscriptionEntries(FeedSubscription subscription,
Date olderThan) {
List<FeedEntryStatus> statuses = findBySubscription(subscription, true,
ReadingOrder.desc, false);
null, false);
saveOrUpdate(markList(statuses, olderThan));
}
public void markCategoryEntries(User user, List<FeedCategory> categories,
Date olderThan) {
List<FeedEntryStatus> statuses = findByCategories(categories, user,
true, ReadingOrder.desc, false);
true, null, false);
saveOrUpdate(markList(statuses, olderThan));
}
public void markStarredEntries(User user, Date olderThan) {
List<FeedEntryStatus> statuses = findStarred(user, ReadingOrder.desc,
false);
List<FeedEntryStatus> statuses = findStarred(user, null, false);
saveOrUpdate(markList(statuses, olderThan));
}
public void markAllEntries(User user, Date olderThan) {
List<FeedEntryStatus> statuses = findAll(user, true, ReadingOrder.desc,
false);
List<FeedEntryStatus> statuses = findAll(user, true, null, false);
saveOrUpdate(markList(statuses, olderThan));
}