diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-07-14 12:08:36 -0600 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-07-14 12:08:36 -0600 |
commit | f6b335b268f5f47e5c48f84f5994f7bdcd8b7e5a (patch) | |
tree | 5f7c5ea574a88a4bc1d825e0c7ea829ddedbf9aa /feeds.py | |
parent | 0aa246b85159bf627873308868cf169868cba569 (diff) | |
parent | ffaa2cfb254a238ba0eb704115b95360305d1ae7 (diff) |
Merge branch 'archweb' into archweb-generic2
Diffstat (limited to 'feeds.py')
-rw-r--r-- | feeds.py | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -50,7 +50,6 @@ class PackageFeed(Feed): link = '/packages/' title_template = 'feeds/packages_title.html' - description_template = 'feeds/packages_description.html' def __call__(self, request, *args, **kwargs): wrapper = condition(etag_func=package_etag, last_modified_func=package_last_modified) @@ -113,6 +112,9 @@ class PackageFeed(Feed): def item_pubdate(self, item): return item.last_update + def item_description(self, item): + return item.pkgdesc + def item_categories(self, item): return (item.repo.name, item.arch.name) @@ -134,7 +136,6 @@ class NewsFeed(Feed): link = '/news/' description = 'The latest and greatest news from the '+settings.BRANDING_DISTRONAME+' distribution.' subtitle = description - title_template = 'feeds/news_title.html' description_template = 'feeds/news_description.html' def __call__(self, request, *args, **kwargs): @@ -156,6 +157,9 @@ class NewsFeed(Feed): def item_author_name(self, item): return item.author.get_full_name() + def item_title(self, item): + return item.title + class ReleaseFeed(Feed): feed_type = GuidNotPermalinkFeed |