from filex.views import make_url
from qcg.forms import FiltersForm, ColumnsForm, JobDescriptionForm, EnvFormSet, JobTemplateForm
from qcg.models import JobTemplate
-<<<<<<< HEAD
-from qcg.utils import paginator_context, to_job_desc, to_form_data, generate_md_inputfile
-=======
-from qcg.utils import paginator_context, to_job_desc, to_form_data, restricted
->>>>>>> 4a588e0... set Cache-Control header for restricted views
-from qcg.service import update_user_data, update_job, cancel, clean
+from qcg.utils import paginator_context, to_job_desc, to_form_data, restricted, cached_resources
+from qcg import service
from django.utils import encoding
import random
import os
from qcg import constants
-from qcg.utils import chunks
+from qcg.utils import chunks, generate_md_inputfile
# for Debugging
from pprint import pprint
@restricted
def jobs_list(request):
- update_user_data(request.user, request.session['proxy'])
+ service.update_user_data(request.user, request.session['proxy'])
tasks = request.user.tasks.order_by('-job__submission_time', '-submission_time') \
.select_related('job').prefetch_related('allocations__nodes')
def process_details(request, job, task=None):
if not job.terminated or not job.purged:
- update_job(job, request.session['proxy'])
+ service.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', ())]
env_formset_data = [{'name': name, 'value': value} for name, value in form_data.pop('env_variables', ())]
else:
form_data, env_formset_data = None, None
+ hosts, applications, modules = cached_resources(request.session['proxy'])
if request.method == 'POST':
- form = JobDescriptionForm(request.POST, initial=form_data)
+ form = JobDescriptionForm(request.POST, form_data, hosts, applications, modules)
env_formset = EnvFormSet(request.POST, initial=env_formset_data)
template_form = JobTemplateForm(request.POST, prefix='template', instance=template)
return redirect(template)
- # wyłączenie wysyłania zadania - zakomentować poniżej
-
- job = job_desc.submit()
+ #pprint(params)
+ job = service.submit(job_desc, request.session['proxy'])
+
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')
else:
- form = JobDescriptionForm(initial=form_data)
+ form = JobDescriptionForm(initial=form_data, hosts=hosts, applications=applications, modules=modules)
env_formset = EnvFormSet(initial=env_formset_data)
template_form = JobTemplateForm(prefix='template', instance=template)
@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, service.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, service.cancel, 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, service.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, service.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> {}',
+ messages.error(request, format_html(u'<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(u'<span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span> {}', msg))
return redirect(obj)
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')
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))
+ 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)
projects / qcg-portal.git / blobdiff