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

Merge branch 'public-corpus' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into public-corpus

Browse Source
This commit is contained in:
Patrick Jentsch
2023-03-13 16:23:51 +01:00
parent 90ac30bba3 4c05c6cc18
commit bac526b927
23 changed files with 334 additions and 532 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/corpora/routes.py
View File

@ -2,7 +2,12 @@ from flask import abort, flash, redirect, render_template, url_for
from flask_login import current_user, login_required
from .decorators import corpus_follower_permission_required
from app import db
from app.models import Corpus, CorpusFollowerAssociation, CorpusFollowerRole
from app.models import (
Corpus,
CorpusFollowerAssociation,
CorpusFollowerRole,
User
)
from . import bp
from .forms import CreateCorpusForm
@ -41,12 +46,14 @@ def create_corpus():
def corpus(corpus_id):
corpus = Corpus.query.get_or_404(corpus_id)
corpus_follower_roles = CorpusFollowerRole.query.all()
users = [u.to_json_serializeable() for u in User.query.filter(User.is_public == True, User.id != current_user.id).all()]
# TODO: Add URL query option to toggle view
if corpus.user == current_user or current_user.is_administrator():
return render_template(
'corpora/corpus.html.j2',
corpus=corpus,
corpus_follower_roles=corpus_follower_roles,
users = users,
title='Corpus'
)
if current_user.is_following_corpus(corpus) or corpus.is_public: