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

display feeds without category when the root category is selected

Browse Source
This commit is contained in:
Jeremie Panzer
2013-03-28 10:55:48 +01:00
parent 78bfc4424f
commit 00dd665c66
5 changed files with 94 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/commafeed/frontend/pages/LoginPage.java
View File

@@ -1,11 +1,9 @@
package com.commafeed.frontend.pages;
import org.apache.wicket.markup.html.WebPage;
import com.commafeed.frontend.pages.auth.LoginPanel;
@SuppressWarnings("serial")
public class LoginPage extends WebPage {
public class LoginPage extends BasePage {
public LoginPage() {
add(new LoginPanel("login"));

63
src/main/java/com/commafeed/frontend/rest/resources/EntriesREST.java
View File

@@ -59,13 +59,6 @@ public class EntriesREST extends AbstractREST {
buildEntries(subscription, offset, limit, unreadOnly));
} else {
FeedCategory feedCategory = null;
if (!ALL.equals(id)) {
feedCategory = feedCategoryService.findById(getUser(),
Long.valueOf(id));
}
List<FeedCategory> childrenCategories = feedCategoryService
.findAllChildrenCategories(getUser(), feedCategory);
List<FeedSubscription> subs = feedSubscriptionService
.findAll(getUser());
@@ -76,10 +69,36 @@ public class EntriesREST extends AbstractREST {
}
});
entries.setName(ALL.equals(id) ? "All" : feedCategory.getName());
entries.getEntries().addAll(
buildEntries(childrenCategories, subMapping, offset, limit,
unreadOnly));
if (ALL.equals(id)) {
entries.setName("All");
entries.getEntries().addAll(
buildEntries(subMapping, offset, limit, unreadOnly));
} else {
FeedCategory feedCategory = feedCategoryService.findById(
getUser(), Long.valueOf(id));
List<FeedCategory> childrenCategories = feedCategoryService
.findAllChildrenCategories(getUser(), feedCategory);
entries.getEntries().addAll(
buildEntries(childrenCategories, subMapping, offset,
limit, unreadOnly));
entries.setName(feedCategory.getName());
}
}
return entries;
}
private List<Entry> buildEntries(Map<Long, FeedSubscription> subMapping,
int offset, int limit, boolean unreadOnly) {
List<Entry> entries = Lists.newArrayList();
List<FeedEntryWithStatus> unreadEntries = feedEntryService.getEntries(
getUser(), unreadOnly, offset, limit);
for (FeedEntryWithStatus feedEntry : unreadEntries) {
Long id = feedEntry.getEntry().getFeed().getId();
entries.add(populateEntry(buildEntry(feedEntry), subMapping.get(id)));
}
return entries;
@@ -155,16 +174,20 @@ public class EntriesREST extends AbstractREST {
markEntry(entry, read);
}
} else if (type == Type.category) {
FeedCategory feedCategory = null;
if (!ALL.equals(id)) {
feedCategory = feedCategoryService.findById(getUser(),
Long.valueOf(id));
}
List<FeedCategory> childrenCategories = feedCategoryService
.findAllChildrenCategories(getUser(), feedCategory);
List<FeedEntryWithStatus> entries = null;
if (ALL.equals(id)) {
entries = feedEntryService.getEntries(getUser(), false);
} else {
FeedCategory feedCategory = feedCategoryService.findById(
getUser(), Long.valueOf(id));
List<FeedCategory> childrenCategories = feedCategoryService
.findAllChildrenCategories(getUser(), feedCategory);
entries = feedEntryService.getEntries(childrenCategories,
getUser(), false);
}
List<FeedEntryWithStatus> entries = feedEntryService.getEntries(
childrenCategories, getUser(), false);
for (FeedEntryWithStatus entry : entries) {
markEntry(entry, true);
}