more normalization

This commit is contained in:
Patrick Jentsch
2023-03-28 14:19:37 +02:00
parent b41436c844
commit 9de09519d6
9 changed files with 72 additions and 46 deletions

View File

@ -24,7 +24,7 @@ from .utils import (
@register_breadcrumb(bp, '.entity.files', 'Files', endpoint_arguments_constructor=corpus_eac)
@login_required
def corpus_files(corpus_id):
return redirect(url_for('.corpus', corpus_id=corpus_id, _anchor='files'))
return redirect(url_for('.corpus', _anchor='files', corpus_id=corpus_id))
@bp.route('/<hashid:corpus_id>/files/create', methods=['GET', 'POST'])
@ -64,9 +64,9 @@ def create_corpus_file(corpus_id):
return '', 201, {'Location': corpus.url}
return render_template(
'corpora/files/create_corpus_file.html.j2',
corpus=corpus,
title='Add corpus file',
form=form,
title='Add corpus file'
corpus=corpus
)
@ -86,10 +86,10 @@ def corpus_file(corpus_id, corpus_file_id):
return redirect(corpus_file.corpus.url)
return render_template(
'corpora/files/corpus_file.html.j2',
corpus=corpus_file.corpus,
corpus_file=corpus_file,
title='Edit corpus file',
form=form,
title='Edit corpus file'
corpus=corpus_file.corpus,
corpus_file=corpus_file
)

View File

@ -43,8 +43,8 @@ def create_corpus():
return redirect(corpus.url)
return render_template(
'corpora/create_corpus.html.j2',
form=form,
title='Create corpus'
title='Create corpus',
form=form
)
@ -59,18 +59,18 @@ def corpus(corpus_id):
if corpus.user == current_user or current_user.is_administrator():
return render_template(
'corpora/corpus.html.j2',
title=corpus.title,
corpus=corpus,
corpus_follower_roles=corpus_follower_roles,
users = users,
title=corpus.title
users = users
)
if current_user.is_following_corpus(corpus) or corpus.is_public:
cfa = CorpusFollowerAssociation.query.filter_by(corpus_id=corpus_id, follower_id=current_user.id).first_or_404()
return render_template(
'corpora/public_corpus.html.j2',
title=corpus.title,
corpus=corpus,
cfa=cfa,
title=corpus.title
cfa=cfa
)
abort(403)