X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=qcg%2Fviews.py;h=e5ff70f902f3bf0d5252b8670ecaf3ff46594473;hb=169ad8dc3e17a7637808f402cba0fa5667b721c3;hp=8a14c2f991e3c00e7e461da7f560f6d12a02e83f;hpb=1459b7887e4f4c9bae86a37c80ab9c0b030c08f2;p=qcg-portal.git diff --git a/qcg/views.py b/qcg/views.py index 8a14c2f..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 @@ -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')