sporada/nopaque
1
0
Fork 0
mirror of https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git synced 2025-06-11 16:40:40 +00:00
Code Issues Projects Releases Wiki Activity

Extend CorpusList for use in public corpora route

Browse Source
This commit is contained in:
Patrick Jentsch
2022-11-30 14:58:45 +01:00
parent 5491cb184a
commit c8d7de434f
3 changed files with 45 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/corpora/routes.py
View File

@ -31,14 +31,17 @@ def user_can_delete_corpus(user, corpus):
@bp.route('')
@login_required
def corpora():
corpora = Corpus.query.filter(Corpus.user_id == current_user.id | Corpus.is_public == True).all()
return render_template('corpora/corpora.html', corpora=corpora)
query = Corpus.query.filter(
(Corpus.user_id == current_user.id) | (Corpus.is_public == True)
)
corpora = [c.to_json_serializeable() for c in query.all()]
return render_template('corpora/corpora.html.j2', corpora=corpora, title='Corpora')
@bp.route('/create', methods=['GET', 'POST'])
@login_required
def create_corpus():
form = CreateCorpusForm(prefix='create-corpus-form')
form = CreateCorpusForm()
if form.validate_on_submit():
try:
corpus = Corpus.create(
@ -150,7 +153,7 @@ def create_corpus_file(corpus_id):
corpus = Corpus.query.get_or_404(corpus_id)
if not user_can_update_corpus(current_user, corpus):
abort(403)
form = CreateCorpusFileForm(prefix='create-corpus-file-form')
form = CreateCorpusFileForm()
if form.is_submitted():
if not form.validate():
response = {'errors': form.errors}
@ -197,10 +200,7 @@ def corpus_file(corpus_id, corpus_file_id):
corpus_file = CorpusFile.query.filter_by(corpus_id = corpus_id, id=corpus_file_id).first_or_404()
if not (corpus_file.corpus.user == current_user or current_user.is_administrator()):
abort(403)
form = UpdateCorpusFileForm(
data=corpus_file.to_json_serializeable(),
prefix='edit-corpus-file-form'
)
form = UpdateCorpusFileForm(data=corpus_file.to_json_serializeable())
if form.validate_on_submit():
form.populate_obj(corpus_file)
if db.session.is_modified(corpus_file):