sporada/nopaque
1
0
Fork 0
mirror of https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git synced 2025-07-29 07:01:35 +00:00
Code Issues Projects Releases Wiki Activity

Unify job input tables

Browse Source
This commit is contained in:
Stephan Porada
2020-07-08 11:35:47 +02:00
parent 0fff7801fd
commit 43f79291aa
4 changed files with 82 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
web/app/jobs/views.py
View File

@@ -3,10 +3,8 @@ from flask import (abort, current_app, flash, redirect, render_template,
from flask_login import current_user, login_required
from . import jobs
from . import tasks
from . tables import JobInputItem, JobInputTable
from ..models import Job, JobInput, JobResult
import os
import html
@jobs.route('/<int:job_id>')
@@ -15,15 +13,13 @@ def job(job_id):
job = Job.query.get_or_404(job_id)
if not (job.creator == current_user or current_user.is_administrator()):
abort(403)
items = [JobInputItem(input.filename, job, input.id)
for input in job.inputs]
# Convert table object to html string and unescape <>& for al little hack to use icons in buttons
job_input_table = html.unescape(JobInputTable(items).__html__())
# Add class "list" to tbody element. Needed for "List.js"
job_input_table = job_input_table.replace('tbody', 'tbody class="list"', 1)
job_inputs = [dict(filename=input.filename,
id=input.id,
job_id=job.id)
for input in job.inputs]
return render_template('jobs/job.html.j2',
job=job,
job_input_table=job_input_table,
job_inputs=job_inputs,
title='Job')