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

(Public-)Corpus List fix+highligting owner status

Browse Source
This commit is contained in:
Inga Kirschnick
2023-05-05 08:41:14 +02:00
parent 8a85dd9e61
commit b07addc5c3
9 changed files with 51 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/main/routes.py
View File

@ -3,6 +3,7 @@ from flask_breadcrumbs import register_breadcrumb
from flask_login import current_user, login_required, login_user
from app.auth.forms import LoginForm
from app.models import Corpus, User
from sqlalchemy import or_
from . import bp
@ -38,8 +39,10 @@ def faq():
@register_breadcrumb(bp, '.dashboard', '<i class="material-icons left">dashboard</i>Dashboard')
@login_required
def dashboard():
corpora = Corpus.query.filter(or_(Corpus.followers.any(id=current_user.id), Corpus.user == current_user)).all()
return render_template(
'main/dashboard.html.j2',
corpora=corpora,
title='Dashboard'
)
@ -81,15 +84,7 @@ def terms_of_use():
@register_breadcrumb(bp, '.social_area', '<i class="material-icons left">group</i>Social Area')
@login_required
def social_area():
# corpora = [
# c.to_json_serializeable() for c
# in Corpus.query.filter(Corpus.is_public == True, Corpus.user != current_user).all()
# ]
corpora = Corpus.query.filter(Corpus.is_public == True, Corpus.user != current_user).all()
# users = [
# u.to_json_serializeable(relationships=True, filter_by_privacy_settings=True,) for u
# in User.query.filter(User.is_public == True, User.id != current_user.id).all()
# ]
users = User.query.filter(User.is_public == True, User.id != current_user.id).all()
return render_template(
'main/social_area.html.j2',