summaryrefslogtreecommitdiff
path: root/public
diff options
context:
space:
mode:
Diffstat (limited to 'public')
-rw-r--r--public/views.py27
1 files changed, 11 insertions, 16 deletions
diff --git a/public/views.py b/public/views.py
index 3ea8f841..29fec470 100644
--- a/public/views.py
+++ b/public/views.py
@@ -5,6 +5,7 @@ from django.conf import settings
from django.contrib.auth.models import User
from django.db.models import Count, Q
from django.http import Http404
+from django.shortcuts import redirect
from django.views.decorators.cache import cache_control
from django.views.generic.simple import direct_to_template
@@ -24,31 +25,25 @@ 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!",
},
}
@cache_control(max_age=300)
-def userlist(request, user_type='devs'):
+def userlist(request, user_type='hackers'):
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")
+ '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"])
+ groups__name__in=["Hackers"])
else:
raise Http404
@@ -76,7 +71,7 @@ def download(request):
'releng_pxeboot_url': settings.PXEBOOT_URL,
'mirror_urls': mirror_urls,
}
- return direct_to_template(request, 'public/download.html', context)
+ return redirect('//wiki.parabolagnulinux.org/get', permanent=True)
@cache_control(max_age=300)
def feeds(request):