Unify more tables (Corpus: corpus files view)

This commit is contained in:
Stephan Porada
2020-07-08 15:24:18 +02:00
parent 43f79291aa
commit ea7bb82661
7 changed files with 134 additions and 51 deletions

View File

@ -9,6 +9,7 @@ from .forms import (AddCorpusFileForm, AddCorpusForm, EditCorpusFileForm,
from .. import db
from ..models import Corpus, CorpusFile
import os
from .. import logger
@corpora.route('/add', methods=['GET', 'POST'])
@ -44,7 +45,17 @@ def corpus(corpus_id):
corpus = Corpus.query.get_or_404(corpus_id)
if not (corpus.creator == current_user or current_user.is_administrator()):
abort(403)
return render_template('corpora/corpus.html.j2', corpus=corpus,
corpus_files = [dict(filename=corpus_file.filename,
author=corpus_file.author,
title=corpus_file.title,
publishing_year=corpus_file.publishing_year,
corpus_id=corpus.id,
id=corpus_file.id
)
for corpus_file in corpus.files]
return render_template('corpora/corpus.html.j2',
corpus=corpus,
corpus_files=corpus_files,
title='Corpus')
@ -216,7 +227,7 @@ def prepare_corpus(corpus_id):
abort(403)
if corpus.files.all():
tasks.build_corpus(corpus_id)
flash('Corpus gets build now.', 'corpus')
flash('Building Corpus...', 'corpus')
else:
flash('Can not build corpus, please add corpus file(s).', 'corpus')
return redirect(url_for('corpora.corpus', corpus_id=corpus_id))