summaryrefslogtreecommitdiff
path: root/mirrors/admin.py
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2012-11-15 01:12:12 -0500
committerLuke Shumaker <LukeShu@sbcglobal.net>2012-11-15 01:12:12 -0500
commit38f1b73179154c1fef676021acd6362e88837a89 (patch)
tree14b7789ccb23a7d0715dc9cfc75d3de0d3700dcf /mirrors/admin.py
parentaa2836cb3859e05e9524def5ec37706e3299205c (diff)
parent03a0d27971898592698dbb0c5948b93c6a3a4741 (diff)
Merge tag 'release_2012-02-18'
Defend against bogus URLs, mirrorlist no FTP by default Conflicts: templates/public/index.html
Diffstat (limited to 'mirrors/admin.py')
-rw-r--r--mirrors/admin.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/mirrors/admin.py b/mirrors/admin.py
index 3786d8d2..a2b59b41 100644
--- a/mirrors/admin.py
+++ b/mirrors/admin.py
@@ -56,7 +56,9 @@ class MirrorRsyncInlineAdmin(admin.TabularInline):
class MirrorAdminForm(forms.ModelForm):
class Meta:
model = Mirror
- upstream = forms.ModelChoiceField(queryset=Mirror.objects.filter(tier__gte=0, tier__lte=1), required=False)
+ upstream = forms.ModelChoiceField(
+ queryset=Mirror.objects.filter(tier__gte=0, tier__lte=1),
+ required=False)
class MirrorAdmin(admin.ModelAdmin):
form = MirrorAdminForm
@@ -70,8 +72,8 @@ class MirrorAdmin(admin.ModelAdmin):
]
class MirrorProtocolAdmin(admin.ModelAdmin):
- list_display = ('protocol', 'is_download',)
- list_filter = ('is_download',)
+ list_display = ('protocol', 'is_download', 'default')
+ list_filter = ('is_download', 'default')
admin.site.register(Mirror, MirrorAdmin)
admin.site.register(MirrorProtocol, MirrorProtocolAdmin)