diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-04-13 21:08:45 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-04-13 21:08:45 -0400 |
| commit | c6eb3b7b3c77d1b70126e0755c9ee66de88d5395 (patch) | |
| tree | 138b206e95b7ec98ad9d319dd95157a2028b4cd1 /public | |
| parent | 81a4f3e5e602d900ebfb2c20eb7565fddfb013a2 (diff) | |
| parent | c910b9220c45eb9d493d260f325efda2141205a4 (diff) | |
Merge branch 'archweb-generic' into master-nomake
# Conflicts:
# public/views.py
Diffstat (limited to 'public')
| -rw-r--r-- | public/views.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/public/views.py b/public/views.py index f04f357b..7414b330 100644 --- a/public/views.py +++ b/public/views.py @@ -17,7 +17,7 @@ from releng.models import Release from .utils import get_recent_updates -@cache_control(max_age=300) +@cache_control(max_age=307) def index(request): if request.user.is_authenticated(): def updates(): @@ -45,7 +45,7 @@ USER_LISTS = { } -@cache_control(max_age=300) +@cache_control(max_age=307) def userlist(request, user_type='hackers'): users = User.objects.order_by( 'username').select_related('userprofile') @@ -63,7 +63,7 @@ def userlist(request, user_type='hackers'): return render(request, 'public/userlist.html', context) -@cache_control(max_age=300) +@cache_control(max_age=307) def donate(request): context = { 'donors': Donor.objects.filter(visible=True).order_by('name'), @@ -81,11 +81,11 @@ def _mirror_urls(): return sorted(urls, key=sort_by) -@cache_control(max_age=300) +@cache_control(max_age=307) def download(request): return HttpResponseRedirect('https://wiki.parabolagnulinux.org/get') -@cache_control(max_age=300) +@cache_control(max_age=307) def feeds(request): repos = Repo.objects.all() if not request.user.is_authenticated(): @@ -97,7 +97,7 @@ def feeds(request): return render(request, 'public/feeds.html', context) -@cache_control(max_age=300) +@cache_control(max_age=307) def keys(request): users = User.objects.filter(is_active=True).select_related( 'userprofile__pgp_key').order_by('first_name', 'last_name') @@ -134,7 +134,7 @@ def keys(request): return render(request, 'public/keys.html', context) -@cache_page(1800) +@cache_page(1789) def keys_json(request): node_list = [] |