From c03b9c5f10b1695c4a099a578f19e09b33c6df10 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 31 Jul 2012 00:16:36 -0500 Subject: feeds: add all arches for repo feed If you wanted to see all updates regardless of architecture for [testing] before, there wasn't really a way to do so. Add one. Signed-off-by: Dan McGee --- feeds.py | 4 +++- templates/public/feeds.html | 3 +++ urls.py | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/feeds.py b/feeds.py index d6a97533..55275ead 100644 --- a/feeds.py +++ b/feeds.py @@ -71,8 +71,10 @@ def get_object(self, request, arch='', repo=''): def title(self, obj): s = 'Arch Linux: Recent package updates' - if 'repo' in obj: + if 'repo' in obj and 'arch' in obj: s += ' (%s [%s])' % (obj['arch'].name, obj['repo'].name.lower()) + elif 'repo' in obj: + s += ' [%s]' % (obj['repo'].name.lower()) elif 'arch' in obj: s += ' (%s)' % (obj['arch'].name) return s diff --git a/templates/public/feeds.html b/templates/public/feeds.html index b4214b1b..f5378afb 100644 --- a/templates/public/feeds.html +++ b/templates/public/feeds.html @@ -36,6 +36,7 @@

Package Feeds

+ All Arches {% for arch in arches %} {{ arch }} {% endfor %} @@ -44,6 +45,7 @@

Package Feeds

All Repos + Feed {% for arch in arches %} Feed {% endfor %} @@ -51,6 +53,7 @@

Package Feeds

{% for repo in repos %} {{ repo }} + Feed {% for arch in arches %} Feed {% endfor %} diff --git a/urls.py b/urls.py index d777b866..6cbee5dc 100644 --- a/urls.py +++ b/urls.py @@ -27,6 +27,8 @@ (r'^packages/$', cache_page(300)(PackageFeed())), (r'^packages/(?P[A-z0-9]+)/$', cache_page(300)(PackageFeed())), + (r'^packages/all/(?P[A-z0-9\-]+)/$', + cache_page(300)(PackageFeed())), (r'^packages/(?P[A-z0-9]+)/(?P[A-z0-9\-]+)/$', cache_page(300)(PackageFeed())), ) -- cgit v1.2.3-54-g00ecf