diff options
Diffstat (limited to 'public')
| -rw-r--r-- | public/views.py | 43 |
1 files changed, 12 insertions, 31 deletions
diff --git a/public/views.py b/public/views.py index d1661afd..f04f357b 100644 --- a/public/views.py +++ b/public/views.py @@ -5,7 +5,7 @@ from operator import attrgetter from django.conf import settings from django.contrib.auth.models import User from django.db.models import Count, Q -from django.http import Http404, HttpResponse +from django.http import Http404, HttpResponse, HttpResponseRedirect from django.shortcuts import render from django.views.decorators.cache import cache_control, cache_page @@ -32,35 +32,28 @@ def index(request): return render(request, 'public/index.html', context) USER_LISTS = { - 'devs': { - 'user_type': 'Developers', - 'user_title': 'Developer', - 'description': "This is a list of the current "+settings.BRANDING_DISTRONAME+" Developers. They maintain the [core] and [extra] package repositories in addition to doing any other developer duties.", - }, - 'tus': { - 'user_type': 'Trusted Users', - 'user_title': 'Trusted User', - 'description': "Here are all your friendly "+settings.BRANDING_DISTRONAME+" Trusted Users who are in charge of the [community] repository.", + 'hackers': { + 'user_type': 'Hackers', + 'user_title': 'Hacker', + 'description': "This is a list of the current "+settings.BRANDING_SHORTNAME+" 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', 'user_title': 'Fellow', - 'description': "Below you can find a list of ex-developers (aka project fellows). These folks helped make "+settings.BRANDING_SHORTNAME+" what it is today. Thanks!", + 'description': "Below you can find a list of ex-hackers (aka project fellows). These folks helped make "+settings.BRANDING_SHORTNAME+" 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 @@ -90,19 +83,7 @@ def _mirror_urls(): @cache_control(max_age=300) def download(request): - try: - release = Release.objects.filter(available=True).latest() - except Release.DoesNotExist: - release = None - - context = { - 'release': release, - 'releng_iso_url': settings.ISO_LIST_URL, - 'releng_pxeboot_url': settings.PXEBOOT_URL, - 'mirror_urls': _mirror_urls, - } - return render(request, 'public/download.html', context) - + return HttpResponseRedirect('https://wiki.parabolagnulinux.org/get') @cache_control(max_age=300) def feeds(request): |