X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=qcg%2Fviews.py;h=89ddfa40168b19c904fa532b840b06c97867d1b7;hb=0b053edee9793cef21c62b3ccb379eb304a22ccd;hp=09812a429078e2301a0c225ed3300133b8726fb8;hpb=8e788ac9ca0ebb6ff38d13bb6fd4bea8348c097f;p=qcg-portal.git

diff --git a/qcg/views.py b/qcg/views.py
index 09812a4..89ddfa4 100644
--- a/qcg/views.py
+++ b/qcg/views.py
@@ -13,15 +13,17 @@ from django.shortcuts import render, get_object_or_404, redirect
 from django.utils.html import format_html
 from django.utils.http import urlencode
 from django.utils.timezone import UTC
+from django.views.decorators.http import require_POST
 from django_openid_auth.views import make_consumer
 from openid.extensions import ax
+from pyqcg.utils.qcg_types import PyqcgException
 
 from filex.forms import HostPathNameForm, RenameForm, ArchiveForm, HostPathForm
 from filex.ftp import FTPOperation, FTPError
 from filex.views import make_url
 from qcg.forms import FiltersForm, ColumnsForm, JobDescriptionForm, EnvFormSet
 from qcg.utils import paginator_context
-from qcg.service import update_user_data, submit_job
+from qcg.service import update_user_data, submit_job, update_job, cancel
 
 
 def index(request):
@@ -143,6 +145,8 @@ def jobs_list(request):
 def job_details(request, job_id):
     job = get_object_or_404(request.user.jobs.prefetch_related('tasks'), job_id=job_id)
 
+    update_job(job, request.session['proxy'])
+
     return render(request, 'qcg/job.html', {'job': job})
 
 
@@ -151,6 +155,8 @@ 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)
 
+    update_job(task.job, request.session['proxy'])
+
     return render(request, 'qcg/task.html', {'task': task})
 
 
@@ -184,6 +190,31 @@ def job_submit(request):
     return render(request, 'qcg/job_submit.html', {'form': form, 'env_formset': env_formset, 'errors': errors})
 
 
+@require_POST
+@login_required
+def job_cancel(request, job_id):
+    return obj_cancel(request, get_object_or_404(request.user.jobs, job_id=job_id))
+
+
+@require_POST
+@login_required
+def task_cancel(request, job_id, task_id):
+    return obj_cancel(request, get_object_or_404(request.user.tasks, job__job_id=job_id, task_id=task_id))
+
+
+def obj_cancel(request, obj):
+    try:
+        cancel(obj, request.session['proxy'])
+    except PyqcgException as e:
+        messages.error(request, format_html('<span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span> {}',
+                                            e.message))
+    else:
+        messages.success(request, format_html('<span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span> '
+                                              'Zadanie anulowano.'))
+
+    return redirect(obj)
+
+
 @login_required
 def gridftp(request):
     return render(request, 'qcg/gridftp.html',