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

fix unread count

Browse Source
This commit is contained in:
Jeremie Panzer
2013-03-22 11:42:25 +01:00
parent 25f0871195
commit bb3431a510
7 changed files with 50 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/commafeed/frontend/CommaFeedSession.java
View File

@@ -45,7 +45,7 @@ public class CommaFeedSession extends AuthenticatedWebSession {
@Override
public boolean authenticate(String userName, String password) {
User user = userService.login(userName, password);
setUser(user);
this.user = user;
return user != null;
}

14
src/main/java/com/commafeed/frontend/rest/FeedSubscriptionsREST.java
View File

@@ -11,7 +11,6 @@ import com.commafeed.backend.dao.FeedEntryService;
import com.commafeed.backend.dao.FeedSubscriptionService;
import com.commafeed.frontend.CommaFeedSession;
import com.commafeed.frontend.pages.JSONPage;
import com.commafeed.frontend.utils.ModelFactory.MF;
import com.commafeed.model.FeedCategory;
import com.commafeed.model.FeedSubscription;
import com.commafeed.model.User;
@@ -24,21 +23,19 @@ public class FeedSubscriptionsREST extends JSONPage {
FeedSubscriptionService feedSubscriptionService;
@Inject
FeedCategoryService FeedCategoryService;
FeedCategoryService feedCategoryService;
@Inject
FeedEntryService feedEntryService;
User user = CommaFeedSession.get().getUser();
@Override
protected Object getObject() {
List<FeedCategory> categories = FeedCategoryService.findAll(user);
User user = CommaFeedSession.get().getUser();
List<FeedCategory> categories = feedCategoryService.findAll(user);
Category root = new Category();
addChildren(categories, root);
for (FeedSubscription subscription : feedSubscriptionService
.findByField(MF.i(MF.p(FeedSubscription.class).getCategory()),
null)) {
.findWithoutCategories(user)) {
Subscription sub = new Subscription();
sub.setId(subscription.getId());
sub.setName(subscription.getTitle());
@@ -65,7 +62,8 @@ public class FeedSubscriptionsREST extends JSONPage {
sub.setId(subscription.getId());
sub.setName(subscription.getTitle());
int size = feedEntryService.getUnreadEntries(
subscription.getFeed(), user).size();
subscription.getFeed(),
CommaFeedSession.get().getUser()).size();
sub.setUnread(size);
child.getFeeds().add(sub);
}