X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=qcg%2Fviews.py;h=f498f950ebf78fc6e38ca49778aece940436d658;hb=2bb5dce1848b7e66179cb0fd10b763620ee6cd3c;hp=5e6cd8e7f7385b62451cb2469910a7e7c53f2ef2;hpb=a48622a1086a47a1abc26dcd3d1d05a384eb1e8f;p=qcg-portal.git

diff --git a/qcg/views.py b/qcg/views.py
index 5e6cd8e..f498f95 100644
--- a/qcg/views.py
+++ b/qcg/views.py
@@ -16,14 +16,15 @@ 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 pyqcg.utils 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, JobTemplateForm
-from qcg.utils import paginator_context
-from qcg.service import update_user_data, make_job_desc, update_job, cancel, clean
+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
 
 
 def index(request):
@@ -156,7 +157,9 @@ def job_details(request, job_id):
 
     update_job(job, request.session['proxy'])
 
-    return render(request, 'qcg/job.html', {'job': job})
+    template_form = JobTemplateForm(initial={'name': job.note or u'Szablon z {}'.format(job.job_id)})
+
+    return render(request, 'qcg/job.html', {'job': job, 'template_form': template_form})
 
 
 @login_required
@@ -174,47 +177,43 @@ def job_submit(request, template_id=None):
     save_template = 'save-template' in request.POST
     template = get_object_or_404(request.user.templates, id=template_id) if template_id is not None else None
 
+    if template is not None:
+        form_data = to_form_data(template.description)
+        env_formset_data = [{'name': name, 'value': value} for name, value in form_data.pop('env_variables', ())]
+    else:
+        form_data, env_formset_data = None, None
+
     if request.method == 'POST':
-        form = JobDescriptionForm(request.POST)
-        env_formset = EnvFormSet(request.POST)
+        form = JobDescriptionForm(request.POST, initial=form_data)
+        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']]
 
-            job_desc = make_job_desc(params, request.session['proxy'])
+            job_desc = to_job_desc(params, request.session['proxy'])
 
             if save_template:
-                if template is not None:
-                    # save already existing template...
-                    instance = template_form.save()
-                else:
-                    # or set attributes for new template
-                    instance = template_form.save(commit=False)
-
-                    instance.owner = request.user
-                    instance.description = job_desc.xml_description
-                    instance.save()
+                template = template_form.save(commit=False)
 
-                return redirect(instance)
+                template.owner = request.user
+                template.description = job_desc.xml_description
+                template.save()
 
-            else:
-                job = job_desc.submit()
+                return redirect(template)
 
-                messages.success(request,
-                                 format_html('<span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span> '
-                                             'Zlecono zadanie <em>{}</em>.', job.job_id))
+            job = job_desc.submit()
 
-                return redirect('jobs')
+            messages.success(request,
+                             format_html('<span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span> '
+                                         u'Zlecono zadanie <em>{}</em>.', job.job_id))
 
-        print 'form', repr(form.errors)
-        print 'env_formset', repr(env_formset.errors)
-        print 'template_form', repr(template_form.errors)
+            return redirect('jobs')
     else:
-        form = JobDescriptionForm()
-        env_formset = EnvFormSet()
+        form = JobDescriptionForm(initial=form_data)
+        env_formset = EnvFormSet(initial=env_formset_data)
         template_form = JobTemplateForm(prefix='template', instance=template)
 
     errors = form.errors or (env_formset.is_bound and not env_formset.is_valid) or (
@@ -307,6 +306,29 @@ def job_templates(request):
 @require_POST
 @login_required
 def template_delete(request, template_id):
-    get_object_or_404(request.user.templates, id=template_id).delete()
+    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> '
+                                          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)