summaryrefslogtreecommitdiff
path: root/public/views.py
diff options
context:
space:
mode:
authorJohannes Krampf <johannes.krampf@gmail.com>2011-12-03 11:59:46 +0100
committerJohannes Krampf <johannes.krampf@gmail.com>2011-12-03 11:59:46 +0100
commitc6deca08fa2a4a71483ad5d7ba9f16e0795bcf02 (patch)
tree49123983cc2150dc232a966a124dc9e5d98cef68 /public/views.py
parentce034483ab02eca8921fe3441012b48a646de47b (diff)
parent4d02cd5b5d4437dd1543e2d45044db72da1989f4 (diff)
Merge https://projects.archlinux.org/git/archweb
Diffstat (limited to 'public/views.py')
-rw-r--r--public/views.py19
1 files changed, 13 insertions, 6 deletions
diff --git a/public/views.py b/public/views.py
index 43b46b12..af46e343 100644
--- a/public/views.py
+++ b/public/views.py
@@ -1,8 +1,3 @@
-from main.models import Arch, Repo, Donor
-from mirrors.models import MirrorUrl
-from news.models import News
-from . import utils
-
from django.conf import settings
from django.contrib.auth.models import User
from django.http import Http404
@@ -10,9 +5,14 @@ from django.shortcuts import redirect
from django.views.generic import list_detail
from django.views.generic.simple import direct_to_template
+from devel.models import MasterKey
+from main.models import Arch, Repo, Donor
+from mirrors.models import MirrorUrl
+from news.models import News
+from utils import get_recent_updates
def index(request):
- pkgs = utils.get_recent_updates()
+ pkgs = get_recent_updates()
context = {
'news_updates': News.objects.order_by('-postdate', '-id')[:15],
'pkg_updates': pkgs,
@@ -61,4 +61,11 @@ def feeds(request):
}
return direct_to_template(request, 'public/feeds.html', context)
+def keys(request):
+ context = {
+ 'keys': MasterKey.objects.select_related('owner', 'revoker',
+ 'owner__userprofile', 'revoker__userprofile').all(),
+ }
+ return direct_to_template(request, 'public/keys.html', context)
+
# vim: set ts=4 sw=4 et: