X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;ds=sidebyside;f=qcg%2Fviews.py;h=e5ff70f902f3bf0d5252b8670ecaf3ff46594473;hb=3e29cd65efbb6b29b3db8c84e625f75829e550e7;hp=6462613248ba7f7b9f442a07bd7e5f2c4d04243d;hpb=f7057f1d6b31506eba169cd9db44f74a34a91f69;p=qcg-portal.git
diff --git a/qcg/views.py b/qcg/views.py
index 6462613..e5ff70f 100644
--- a/qcg/views.py
+++ b/qcg/views.py
@@ -155,11 +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'])
-
- 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})
+ return render(request, 'qcg/job.html', process_details(request, job))
@login_required
@@ -167,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', ())]
+
+ 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 render(request, 'qcg/task.html', {'task': task})
+ return {'job': job, 'task': task, 'form': form, 'env_formset': env_formset, 'template_form': template_form}
@login_required
@@ -188,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']]
@@ -208,7 +222,7 @@ def job_submit(request, template_id=None):
messages.success(request,
format_html(' '
- 'Zlecono zadanie {}.', job.job_id))
+ u'Zlecono zadanie {}.', job.job_id))
return redirect('jobs')
else:
@@ -310,7 +324,7 @@ def template_delete(request, template_id):
template.delete()
messages.success(request, format_html(' '
- 'UsuniÄto szablon {}.', template.name))
+ u'UsuniÄto szablon {}.', template.name))
return redirect('job_templates')