X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=qcg%2Fviews.py;h=e5ff70f902f3bf0d5252b8670ecaf3ff46594473;hb=169ad8dc3e17a7637808f402cba0fa5667b721c3;hp=2dc5e8f09da2fab9c07344623f97a842d4e106b9;hpb=dd8e6b0785c78c42c3866f161dd853a54e47275a;p=qcg-portal.git

diff --git a/qcg/views.py b/qcg/views.py
index 2dc5e8f..e5ff70f 100644
--- a/qcg/views.py
+++ b/qcg/views.py
@@ -22,6 +22,7 @@ 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, JobTemplateForm
+from qcg.models import JobTemplate
 from qcg.utils import paginator_context, to_job_desc, to_form_data
 from qcg.service import update_user_data, update_job, cancel, clean
 
@@ -154,9 +155,7 @@ 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})
+    return render(request, 'qcg/job.html', process_details(request, job))
 
 
 @login_required
@@ -164,9 +163,27 @@ 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', process_details(request, task.job, task))
+
+
+def process_details(request, job, task=None):
+    if not job.terminated or not job.purged:
+        update_job(job, request.session['proxy'])
+
+    form_data = to_form_data(job.qcg_description)
+    env_formset_data = [{'name': name, 'value': value} for name, value in form_data.pop('env_variables', ())]
 
-    return render(request, 'qcg/task.html', {'task': task})
+    form = JobDescriptionForm(initial=form_data)
+    env_formset = EnvFormSet(initial=env_formset_data)
+    template_form = JobTemplateForm(initial={'name': (task and task.note) or u'Szablon z {}'.format(job.job_id)})
+
+    for field in form:
+        field.field.widget.attrs['disabled'] = 'True'
+    for env_form in env_formset:
+        for field in env_form:
+            field.field.widget.attrs['disabled'] = 'True'
+
+    return {'job': job, 'task': task, 'form': form, 'env_formset': env_formset, 'template_form': template_form}
 
 
 @login_required
@@ -185,7 +202,7 @@ def job_submit(request, template_id=None):
         env_formset = EnvFormSet(request.POST, initial=env_formset_data)
         template_form = JobTemplateForm(request.POST, prefix='template', instance=template)
 
-        if form.is_valid() and env_formset.is_valid() and (not save_template or template_form.is_valid):
+        if form.is_valid() and env_formset.is_valid() and (not save_template or template_form.is_valid()):
             params = form.cleaned_data
             params['env_variables'] = [(env['name'], env['value'])
                                        for env in env_formset.cleaned_data if env and not env['DELETE']]
@@ -205,7 +222,7 @@ def job_submit(request, template_id=None):
 
             messages.success(request,
                              format_html('<span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span> '
-                                         'Zlecono zadanie <em>{}</em>.', job.job_id))
+                                         u'Zlecono zadanie <em>{}</em>.', job.job_id))
 
             return redirect('jobs')
     else:
@@ -307,6 +324,25 @@ def template_delete(request, template_id):
     template.delete()
 
     messages.success(request, format_html('<span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span> '
-                                          'Usunięto szablon <em>{}</em>.', template.name))
+                                          u'Usunięto szablon <em>{}</em>.', template.name))
 
     return redirect('job_templates')
+
+
+@require_POST
+@login_required
+def job_save_template(request, job_id):
+    job = get_object_or_404(request.user.jobs, job_id=job_id)
+
+    template_form = JobTemplateForm(request.POST,
+                                    instance=JobTemplate(owner=request.user, description=job.qcg_description))
+
+    if template_form.is_valid():
+        template = template_form.save()
+
+        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))
+
+    return redirect(job)