Merge branch 'master' of git://projects.archlinux.org/archweb

Conflicts:
	devel/views.py
	feeds.py
	templates/devel/index.html
	templates/packages/flag.html
	templates/public/index.html
	todolists/views.py
	urls.py

1 files changed, 31 insertions, 0 deletions

diff --git a/releng/admin.py b/releng/admin.py
new file mode 100644
index 00000000..be5e211f
--- /dev/null
+++ b/releng/admin.py
@@ -0,0 +1,31 @@
+from django.contrib import admin
+
+from .models import (Architecture, BootType, Bootloader, ClockChoice,
+        Filesystem, HardwareType, InstallType, Iso, IsoType, Module, Source,
+        Test)
+
+class IsoAdmin(admin.ModelAdmin):
+    list_display = ('name', 'created', 'active')
+    list_filter = ('active',)
+
+class TestAdmin(admin.ModelAdmin):
+    list_display = ('user_name', 'user_email', 'created', 'ip_address',
+            'iso', 'success')
+    list_filter = ('success', 'iso')
+
+
+admin.site.register(Architecture)
+admin.site.register(BootType)
+admin.site.register(Bootloader)
+admin.site.register(ClockChoice)
+admin.site.register(Filesystem)
+admin.site.register(HardwareType)
+admin.site.register(InstallType)
+admin.site.register(IsoType)
+admin.site.register(Module)
+admin.site.register(Source)
+
+admin.site.register(Iso, IsoAdmin)
+admin.site.register(Test, TestAdmin)
+
+# vim: set ts=4 sw=4 et: