--- a/Allura/allura/lib/macro.py
+++ b/Allura/allura/lib/macro.py
@@ -67,23 +67,20 @@
@macro('neighborhood-wiki')
def neighborhood_feeds(tool_name, max_number=5, sort='pubdate'):
from allura import model as M
- if not h.has_access(c.project.neighborhood, 'read'): return ''
- max_number = int(max_number)
- feed = M.Feed.items_with_access(
+ feed = M.Feed.query.find(
dict(
tool_name=tool_name,
- neighborhood_id=c.project.neighborhood._id),
- limit=max_number,
- sort=(sort, pymongo.DESCENDING))
- items = [
+ neighborhood_id=c.project.neighborhood._id))
+ feed = feed.sort(sort, pymongo.DESCENDING).limit(int(max_number)).all()
+ output = '\n'.join(
template_neighborhood_feeds.substitute(dict(
href=item.link,
title=item.title,
author=item.author_name,
ago=h.ago(item.pubdate),
description=item.description))
- for item in feed]
- return '\n'.join(items)
+ for item in feed)
+ return output
@macro('neighborhood-wiki')
def projects(