diff options
Diffstat (limited to 'public')
| -rw-r--r-- | public/views.py | 40 |
1 files changed, 11 insertions, 29 deletions
diff --git a/public/views.py b/public/views.py index c28fd303..1aae2846 100644 --- a/public/views.py +++ b/public/views.py @@ -6,6 +6,7 @@ from . import utils from django.conf import settings from django.contrib.auth.models import User from django.http import Http404 +from django.shortcuts import redirect from django.views.generic import list_detail from django.views.generic.simple import direct_to_template @@ -19,30 +20,22 @@ def index(request): return direct_to_template(request, 'public/index.html', context) USER_LISTS = { - 'devs': { - 'user_type': 'Developers', - 'description': "This is a list of the current Arch Linux Developers. They maintain the [core] and [extra] package repositories in addition to doing any other developer duties.", - }, - 'tus': { - 'user_type': 'Trusted Users', - 'description': "Here are all your friendly Arch Linux Trusted Users who are in charge of the [community] repository.", + 'hackers': { + 'user_type': 'Hackers', + 'description': "This is a list of the current Parabola Hackers. They maintain the [libre] package repository and keep the [core], [extra] and [community] repositories clean of unfree software, in addition to doing any other developer duties.", }, 'fellows': { 'user_type': 'Fellows', - 'description': "Below you can find a list of ex-developers (aka project fellows). These folks helped make Arch what it is today. Thanks!", + 'description': "Below you can find a list of ex-hackers (aka project fellows). These folks helped make Parabola what it is today. Thanks!", }, } -def userlist(request, user_type='devs'): - users = User.objects.order_by( - 'first_name', 'last_name').select_related('userprofile') - if user_type == 'devs': - users = users.filter(is_active=True, groups__name="Developers") - elif user_type == 'tus': - users = users.filter(is_active=True, groups__name="Trusted Users") +def userlist(request, user_type='hackers'): + users = User.objects.order_by('username').select_related('userprofile') + if user_type == 'hackers': + users = users.filter(is_active=True, groups__name="Hackers") elif user_type == 'fellows': - users = users.filter(is_active=False, - groups__name__in=["Developers", "Trusted Users"]) + users = users.filter(is_active=False, groups__name__in=["Hackers"]) else: raise Http404 @@ -57,18 +50,7 @@ def donate(request): return direct_to_template(request, 'public/donate.html', context) def download(request): - qset = MirrorUrl.objects.select_related('mirror', 'protocol').filter( - protocol__is_download=True, - mirror__public=True, mirror__active=True, mirror__isos=True - ) - context = { - 'releng_iso_url': settings.ISO_LIST_URL, - } - return list_detail.object_list(request, - qset.order_by('mirror__country', 'mirror__name', 'protocol'), - template_name="public/download.html", - template_object_name="mirror_url", - extra_context=context) + return redirect('http://wiki.parabolagnulinux.org/get', permanent=True) def feeds(request): context = { |