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

use tag for feed name is available

Browse Source
This commit is contained in:
Athou
2013-10-14 07:41:19 +02:00
parent a0b937769d
commit 287dea2d36
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/commafeed/frontend/rest/resources/CategoryREST.java
View File

@@ -22,7 +22,7 @@ import javax.ws.rs.core.Response.Status;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang.StringUtils;
import com.commafeed.backend.cache.CacheService;
@@ -136,7 +136,7 @@ public class CategoryREST extends AbstractREST {
}
if (ALL.equals(id)) {
entries.setName("All");
entries.setName(ObjectUtils.defaultIfNull(tag, "All"));
List<FeedSubscription> subs = feedSubscriptionDAO.findAll(getUser());
removeExcludedSubscriptions(subs, excludedIds);
List<FeedEntryStatus> list = feedEntryStatusDAO.findBySubscriptions(getUser(), subs, unreadOnly, keywords, newerThanDate,