rename sync -> service & add logging

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

diff --git a/qcg/views.py b/qcg/views.py
index 53491cc..a760425 100644 (file)
--- a/qcg/views.py
+++ b/qcg/views.py
@@ -16,7 +16,8 @@ from pyqcg.description import JobDescription
 from pyqcg.utils import Credential
 
 from qcg.forms import FiltersForm, ColumnsForm, JobDescriptionForm, EnvFormSet
-from qcg.utils import update_user_data, paginator_context
+from qcg.utils import paginator_context
+from qcg.service import update_user_data
 
 
 def index(request):
@@ -56,8 +57,8 @@ def parse_date(string):
 
 @login_required
 def jobs_list(request):
-    # QCG.start()
-    # update_user_data(request.user, request.session['proxy'])
+    QCG.start()
+    update_user_data(request.user, request.session['proxy'])
 
     tasks = request.user.tasks.order_by('-job__submission_time', '-submission_time') \
         .select_related('job').prefetch_related('allocations__nodes')
@@ -160,6 +161,7 @@ def job_new(request):
 
         if form.is_valid() and env_formset.is_valid():
             print form.cleaned_data
+            print env_formset.cleaned_data
 
             desc = JobDescription(Credential(request.session['proxy']))
 
@@ -170,11 +172,16 @@ def job_new(request):
                 if form.cleaned_data[name]:
                     setattr(desc, name, form.cleaned_data[name])
 
-            desc.set_application(*form.cleaned_data['application'])
-            desc.set_nodes(*form.cleaned_data['nodes'])
-            desc.set_reservation(form.cleaned_data['reservation'])
-            desc.set_watch_output(form.cleaned_data['watch_output'], form.cleaned_data['watch_output_pattern'])
-            desc.env_variables += [(env['name'], env['value']) for env in env_formset.cleaned_data if not env['DELETE']]
+            if form.cleaned_data['application']:
+                desc.set_application(*form.cleaned_data['application'])
+            if form.cleaned_data['nodes']:
+                desc.set_nodes(*form.cleaned_data['nodes'])
+            if form.cleaned_data['reservation']:
+                desc.set_reservation(form.cleaned_data['reservation'])
+            if form.cleaned_data['watch_output']:
+                desc.set_watch_output(form.cleaned_data['watch_output'], form.cleaned_data['watch_output_pattern'])
+            desc.env_variables += [(env['name'], env['value'])
+                                   for env in env_formset.cleaned_data if env and not env['DELETE']]
             # TODO script
             # TODO executable
             # TODO input
@@ -196,3 +203,8 @@ def job_new(request):
     errors = form.errors or (env_formset.is_bound and not env_formset.is_valid)
 
     return render(request, 'qcg/job_new.html', {'form': form, 'env_formset': env_formset, 'errors': errors})
+
+
+@login_required
+def gridftp(request):
+    return render(request, 'qcg/gridftp.html')