summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-08-22 16:42:06 -0500
committerDan McGee <dan@archlinux.org>2011-08-22 16:42:06 -0500
commitc5b370f432215eb69dabd6bcb911b6429b16447a (patch)
tree10adf19cd9a3f6bb3f92d850023e4ef77e94185a
parent60738969375fc72ff254517107ce53e14b068e24 (diff)
Admin setup tweaks
Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--mirrors/admin.py3
-rw-r--r--packages/admin.py3
-rw-r--r--releng/admin.py4
-rw-r--r--releng/models.py6
4 files changed, 11 insertions, 5 deletions
diff --git a/mirrors/admin.py b/mirrors/admin.py
index b7b478de..0632872d 100644
--- a/mirrors/admin.py
+++ b/mirrors/admin.py
@@ -59,7 +59,8 @@ class MirrorAdminForm(forms.ModelForm):
class MirrorAdmin(admin.ModelAdmin):
form = MirrorAdminForm
- list_display = ('name', 'tier', 'country', 'active', 'public', 'isos', 'admin_email', 'supported_protocols')
+ list_display = ('name', 'tier', 'country', 'active', 'public',
+ 'isos', 'admin_email')
list_filter = ('tier', 'active', 'public', 'country')
search_fields = ('name',)
inlines = [
diff --git a/packages/admin.py b/packages/admin.py
index 3ecfdbb1..01b6ed6c 100644
--- a/packages/admin.py
+++ b/packages/admin.py
@@ -3,8 +3,9 @@ from django.contrib import admin
from .models import PackageRelation
class PackageRelationAdmin(admin.ModelAdmin):
- list_display = ('user', 'pkgbase', 'type')
+ list_display = ('user', 'pkgbase', 'type', 'created')
list_filter = ('type', 'user')
+ search_fields = ('user__username', 'pkgbase')
admin.site.register(PackageRelation, PackageRelationAdmin)
diff --git a/releng/admin.py b/releng/admin.py
index be5e211f..e1411b84 100644
--- a/releng/admin.py
+++ b/releng/admin.py
@@ -5,8 +5,8 @@ from .models import (Architecture, BootType, Bootloader, ClockChoice,
Test)
class IsoAdmin(admin.ModelAdmin):
- list_display = ('name', 'created', 'active')
- list_filter = ('active',)
+ list_display = ('name', 'created', 'active', 'removed')
+ list_filter = ('active', 'created')
class TestAdmin(admin.ModelAdmin):
list_display = ('user_name', 'user_email', 'created', 'ip_address',
diff --git a/releng/models.py b/releng/models.py
index a958288b..56187766 100644
--- a/releng/models.py
+++ b/releng/models.py
@@ -29,11 +29,15 @@ class Iso(models.Model):
def __unicode__(self):
return self.name
+ class Meta:
+ verbose_name = 'ISO'
+
class Architecture(IsoOption):
pass
class IsoType(IsoOption):
- pass
+ class Meta:
+ verbose_name = 'ISO type'
class BootType(IsoOption):
pass