diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-11-15 01:12:12 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-11-15 01:12:12 -0500 |
| commit | 38f1b73179154c1fef676021acd6362e88837a89 (patch) | |
| tree | 14b7789ccb23a7d0715dc9cfc75d3de0d3700dcf /mirrors/views.py | |
| parent | aa2836cb3859e05e9524def5ec37706e3299205c (diff) | |
| parent | 03a0d27971898592698dbb0c5948b93c6a3a4741 (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/views.py')
| -rw-r--r-- | mirrors/views.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mirrors/views.py b/mirrors/views.py index 417e26ee..2ef8654d 100644 --- a/mirrors/views.py +++ b/mirrors/views.py @@ -29,8 +29,9 @@ class MirrorlistForm(forms.Form): self.fields['country'].initial = ['all'] protos = make_choice( MirrorProtocol.objects.filter(is_download=True)) + initial = MirrorProtocol.objects.filter(is_download=True, default=True) self.fields['protocol'].choices = protos - self.fields['protocol'].initial = [t[0] for t in protos] + self.fields['protocol'].initial = [p.protocol for p in initial] self.fields['ip_version'].initial = ['4'] @csrf_exempt @@ -48,7 +49,8 @@ def generate_mirrorlist(request): else: form = MirrorlistForm() - return direct_to_template(request, 'mirrors/index.html', {'mirrorlist_form': form}) + return direct_to_template(request, 'mirrors/index.html', + {'mirrorlist_form': form}) def find_mirrors(request, countries=None, protocols=None, use_status=False, ipv4_supported=True, ipv6_supported=True): |