From: Maciej Tronowski Date: Tue, 1 Sep 2015 15:48:59 +0000 (+0200) Subject: set Cache-Control header for restricted views X-Git-Tag: v1.1~30 X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=commitdiff_plain;h=93d6b9d3273e1f35c0147ae9a58ac142eceb75cb;p=qcg-portal.git set Cache-Control header for restricted views --- diff --git a/qcg/utils.py b/qcg/utils.py index 6140e7b..44de96f 100644 --- a/qcg/utils.py +++ b/qcg/utils.py @@ -1,11 +1,16 @@ # coding=utf-8 + +from functools import wraps + import os import string import random +from django.contrib.auth.decorators import login_required from django.core.paginator import Paginator from django.utils.formats import date_format from django.utils.timezone import localtime +from django.views.decorators.cache import cache_control from pyqcg import QCG from pyqcg.utils import Credential from pyqcg.description import JobDescription @@ -186,3 +191,7 @@ def to_form_data(xml): params['postprocess_cmd'] = desc.postprocess return params + + +def restricted(view): + return wraps(view)(cache_control(no_cache=True, must_revalidate=True, no_store=True)(login_required(view))) diff --git a/qcg/views.py b/qcg/views.py index 0be97bb..fec0017 100644 --- a/qcg/views.py +++ b/qcg/views.py @@ -23,7 +23,11 @@ from filex.ftp import FTPOperation, FTPError from filex.views import make_url from qcg.forms import FiltersForm, ColumnsForm, JobDescriptionForm, EnvFormSet, JobTemplateForm from qcg.models import JobTemplate +<<<<<<< HEAD from qcg.utils import paginator_context, to_job_desc, to_form_data, generate_md_inputfile +======= +from qcg.utils import paginator_context, to_job_desc, to_form_data, restricted +>>>>>>> 4a588e0... set Cache-Control header for restricted views from qcg.service import update_user_data, update_job, cancel, clean @@ -71,7 +75,7 @@ def parse_date(string): return datetime.strptime(string.strip(), "%d.%m.%Y").replace(tzinfo=UTC()) -@login_required +@restricted def jobs_list(request): update_user_data(request.user, request.session['proxy']) @@ -160,14 +164,14 @@ def jobs_list(request): return render(request, 'qcg/jobs.html', context) -@login_required +@restricted def job_details(request, job_id): job = get_object_or_404(request.user.jobs.prefetch_related('tasks'), job_id=job_id) return render(request, 'qcg/job.html', process_details(request, job)) -@login_required +@restricted def task_details(request, job_id, task_id): task = get_object_or_404(request.user.tasks.select_related('job').prefetch_related('allocations'), job__job_id=job_id, task_id=task_id) @@ -195,12 +199,10 @@ def process_details(request, job, task=None): return {'job': job, 'task': task, 'form': form, 'env_formset': env_formset, 'template_form': template_form} - - def id_generator(size=6, chars=string.ascii_uppercase + string.digits): return ''.join(random.choice(chars) for _ in range(size)) -@login_required +@restricted def job_submit(request, template_id=None): save_template = 'save-template' in request.POST template = get_object_or_404(request.user.templates, id=template_id) if template_id is not None else None @@ -319,13 +321,13 @@ def obj_clean(request, obj): return redirect(obj) -@login_required +@restricted def gridftp(request): return render(request, 'qcg/gridftp.html', {'new_dir_form': HostPathNameForm(), 'rename_form': RenameForm(), 'archive_form': ArchiveForm()}) -@login_required +@restricted def gridftp_upload(request): form = HostPathForm(request.GET) @@ -344,7 +346,7 @@ def gridftp_upload(request): 'sep': '/' if form.cleaned_data['path'].startswith('~') else ''}) -@login_required +@restricted def job_templates(request): return render(request, 'qcg/job_templates.html', {'templates': request.user.templates.all()})