Rename routes and templates in corpora package

app/corpora/decorators.py

@@ -9,11 +9,11 @@ def corpus_follower_permission_required(*permissions):
         @wraps(f)
         def decorated_function(*args, **kwargs):
             corpus_id = kwargs.get('corpus_id')
-            cfa = CorpusFollowerAssociation.query.filter_by(corpus_id=corpus_id, follower_id=current_user.id).first()
-            if cfa is None:
-                abort(403)
-            corpus = cfa.corpus
+            corpus = Corpus.query.get_or_404(corpus_id)
             if not (corpus.user == current_user or current_user.is_administrator()):
+                cfa = CorpusFollowerAssociation.query.filter_by(corpus_id=corpus_id, follower_id=current_user.id).first()
+                if cfa is None:
+                    abort(403)
                 if not all([cfa.role.has_permission(p) for p in permissions]):
                     abort(403)
             return f(*args, **kwargs)

app/corpora/files/routes.py

@@ -14,9 +14,7 @@ from ..decorators import corpus_follower_permission_required
 from ..utils import corpus_endpoint_arguments_constructor as corpus_eac
 from . import bp
 from .forms import CreateCorpusFileForm, UpdateCorpusFileForm
-from .utils import (
-    corpus_file_dynamic_list_constructor as corpus_file_dlc
-)
+from .utils import corpus_file_dynamic_list_constructor as corpus_file_dlc
 
 
 @bp.route('/<hashid:corpus_id>/files')
@@ -60,7 +58,7 @@ def create_corpus_file(corpus_id):
         flash(f'Corpus File "{corpus_file.filename}" added', category='corpus')
         return '', 201, {'Location': corpus.url}
     return render_template(
-        'corpora/files/create_corpus_file.html.j2',
+        'corpora/files/create.html.j2',
         title='Add corpus file',
         form=form,
         corpus=corpus

app/corpora/routes.py

@@ -40,7 +40,7 @@ def create_corpus():
         flash(f'Corpus "{corpus.title}" created', 'corpus')
         return redirect(corpus.url)
     return render_template(
-        'corpora/create_corpus.html.j2',
+        'corpora/create.html.j2',
         title='Create corpus',
         form=form
     )
@@ -72,13 +72,13 @@ def corpus(corpus_id):
     abort(403)
 
 
-@bp.route('/<hashid:corpus_id>/analyse')
+@bp.route('/<hashid:corpus_id>/analysis')
 @corpus_follower_permission_required('VIEW')
-@register_breadcrumb(bp, '.entity.analyse', 'Analyse', endpoint_arguments_constructor=corpus_eac)
-def analyse_corpus(corpus_id):
+@register_breadcrumb(bp, '.entity.analysis', 'Analysis', endpoint_arguments_constructor=corpus_eac)
+def analysis(corpus_id):
     corpus = Corpus.query.get_or_404(corpus_id)
     return render_template(
-        'corpora/analyse_corpus.html.j2',
+        'corpora/analysis.html.j2',
         corpus=corpus,
         title=f'Analyse Corpus {corpus.title}'
     )