X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=qcg%2Fviews.py;h=3fae34300f8ee0ab647ec5f392653c414687c7fb;hb=1073f7f5b5a9e51fd79ab58f1f4fb3389d7e6331;hp=dab0a2428b1fb2bf318d20765086e99eb47c263b;hpb=a58466aa69d7c78bb740d90a446bcc71898deb08;p=qcg-portal.git

diff --git a/qcg/views.py b/qcg/views.py
index dab0a24..3fae343 100644
--- a/qcg/views.py
+++ b/qcg/views.py
@@ -23,12 +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
-<<<<<<< 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
+from qcg.service import update_user_data, update_job, cancel, clean, submit
 
 
 from django.utils import encoding
@@ -36,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
 
@@ -251,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> '