move job submission to dedicated function

[qcg-portal.git] / qcg / views.py

diff --git a/qcg/views.py b/qcg/views.py
index 073c08b..3fae343 100644 (file)
--- a/qcg/views.py
+++ b/qcg/views.py
@@ -23,8 +23,8 @@ 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
-from qcg.utils import paginator_context, to_job_desc, to_form_data, generate_md_inputfile
-from qcg.service import update_user_data, update_job, cancel, clean
+from qcg.utils import paginator_context, to_job_desc, to_form_data, restricted
+from qcg.service import update_user_data, update_job, cancel, clean, submit
 
 
 from django.utils import encoding
@@ -32,7 +32,7 @@ import string
 import random
 import os
 from qcg import constants
-from qcg.utils import chunks
+from qcg.utils import chunks, generate_md_inputfile
 # for Debugging
 from pprint import pprint
 
@@ -71,7 +71,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,16 +160,16 @@ 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)
+    job = get_object_or_404(request.user.jobs.select_related('owner').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'),
+    task = get_object_or_404(request.user.tasks.select_related('job__owner').prefetch_related('allocations'),
                              job__job_id=job_id, task_id=task_id)
 
     return render(request, 'qcg/task.html', process_details(request, task.job, task))
@@ -195,12 +195,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 +233,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'])
 
 
@@ -250,8 +247,9 @@ def job_submit(request, template_id=None):
                 return redirect(template)
 
             # wyłączenie wysyłania zadania - zakomentować poniżej
-            
-            job = job_desc.submit()
+
+            job = submit(job_desc, request.session['proxy'])
+
 
             messages.success(request,
                              format_html('<span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span> '
@@ -320,13 +318,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 +343,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()})