common function for job/task cancelation and cleaning

diff --git a/qcg/views.py b/qcg/views.py
index b5c5315..dae0ad4 100644 (file)
--- a/qcg/views.py
+++ b/qcg/views.py
@@ -251,7 +251,7 @@ def job_submit(request, template_id=None):
 
 
             messages.success(request,
-                             format_html('<span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span> '
+                             format_html(u'<span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span> '
                                          u'Zlecono zadanie <em>{}</em>.', job.job_id))
             
             return redirect('jobs')
@@ -270,49 +270,40 @@ def job_submit(request, template_id=None):
 @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))
+    job = get_object_or_404(request.user.jobs, job_id=job_id)
+    return obj_run(request, job, cancel, u'Zadanie anulowano.')
 
 
 @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)
+    task = get_object_or_404(request.user.tasks, job__job_id=job_id, task_id=task_id)
+    return obj_run(request, task, task, u'Zadanie anulowano.')
 
 
 @require_POST
 @login_required
 def job_clean(request, job_id):
-    return obj_clean(request, get_object_or_404(request.user.jobs, job_id=job_id))
+    job = get_object_or_404(request.user.jobs, job_id=job_id)
+    return obj_run(request, job, clean, u'Usunięto katalog roboczy.')
 
 
 @require_POST
 @login_required
 def task_clean(request, job_id, task_id):
-    return obj_clean(request, get_object_or_404(request.user.tasks, job__job_id=job_id, task_id=task_id))
+    task = get_object_or_404(request.user.tasks, job__job_id=job_id, task_id=task_id)
+    return obj_run(request, task, clean, u'Usunięto katalog roboczy.')
 
 
-def obj_clean(request, obj):
+def obj_run(request, obj, func, msg):
     try:
-        clean(obj, request.session['proxy'])
+        func(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> '
-                                              'Usunięto katalog roboczy.'))
+        messages.success(request,
+                         format_html('<span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span> {}', msg))
 
     return redirect(obj)
 
@@ -353,7 +344,7 @@ def template_delete(request, template_id):
     template = get_object_or_404(request.user.templates, id=template_id)
     template.delete()
 
-    messages.success(request, format_html('<span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span> '
+    messages.success(request, format_html(u'<span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span> '
                                           u'Usunięto szablon <em>{}</em>.', template.name))
 
     return redirect('job_templates')
@@ -372,7 +363,7 @@ def job_save_template(request, job_id):
 
         return redirect(template)
 
-    messages.error(request, format_html('<span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span> {}'
-                                        'Nie udało się zapisać szablonu!', template_form.errors))
+    messages.error(request, format_html(u'<span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span> {}'
+                                        u'Nie udało się zapisać szablonu!', template_form.errors))
 
     return redirect(job)