X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=qcg%2Fviews.py;h=fec0017a7ff5b4e068d8f55cfdcfdbc33362703b;hb=50ea4b8539cffc10de1342d696b7b9a184c1a89c;hp=073c08b4d2515ce958da8b952c8a63c949fe9671;hpb=9f0267486fef6a929c431db5cb76a36e2f93ed54;p=qcg-portal.git

diff --git a/qcg/views.py b/qcg/views.py
index 073c08b..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
@@ -235,8 +237,7 @@ def job_submit(request, template_id=None):
             ftp.wait()
             
             params['persistent'] = True
-            # Debugging parametrów
-            # pprint(params)
+
             job_desc = to_job_desc(params, request.session['proxy'])
 
 
@@ -320,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)
 
@@ -345,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()})