mirror of
https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git
synced 2025-06-16 11:00:41 +00:00
Bump dependencies. Some parts needed to be deactivated for that. They need to be reimplemented.
- breadcrumbs (!flask-breadcrumbs) - manual modal button - api blueprint (!flask-marshmallow/!marshmallow-sqlalchemy)
This commit is contained in:
@ -5,21 +5,17 @@ from flask import (
|
||||
send_from_directory,
|
||||
url_for
|
||||
)
|
||||
from flask_breadcrumbs import register_breadcrumb
|
||||
from flask_login import current_user
|
||||
from app.models import User
|
||||
from . import bp
|
||||
from .utils import user_dynamic_list_constructor as user_dlc
|
||||
|
||||
|
||||
@bp.route('')
|
||||
@register_breadcrumb(bp, '.', '<i class="material-icons left">group</i>Users')
|
||||
def users():
|
||||
return redirect(url_for('main.social_area', _anchor='users'))
|
||||
|
||||
|
||||
@bp.route('/<hashid:user_id>')
|
||||
@register_breadcrumb(bp, '.entity', '', dynamic_list_constructor=user_dlc)
|
||||
def user(user_id):
|
||||
user = User.query.get_or_404(user_id)
|
||||
if not (user.is_public or user == current_user or current_user.is_administrator):
|
||||
@ -42,6 +38,6 @@ def user_avatar(user_id):
|
||||
user.avatar.path.parent,
|
||||
user.avatar.path.name,
|
||||
as_attachment=True,
|
||||
attachment_filename=user.avatar.filename,
|
||||
download_name=user.avatar.filename,
|
||||
mimetype=user.avatar.mimetype
|
||||
)
|
||||
|
@ -1,9 +1,7 @@
|
||||
from flask import abort, flash, g, redirect, render_template, url_for
|
||||
from flask_breadcrumbs import register_breadcrumb
|
||||
from flask_login import current_user
|
||||
from app import db
|
||||
from app.models import Avatar, User
|
||||
from ..utils import user_endpoint_arguments_constructor as user_eac
|
||||
from . import bp
|
||||
from .forms import (
|
||||
UpdateAvatarForm,
|
||||
@ -15,7 +13,6 @@ from .forms import (
|
||||
|
||||
|
||||
@bp.route('/<hashid:user_id>/settings', methods=['GET', 'POST'])
|
||||
@register_breadcrumb(bp, '.entity.settings', '<i class="material-icons left">settings</i>Settings', endpoint_arguments_constructor=user_eac)
|
||||
def settings(user_id):
|
||||
user = User.query.get_or_404(user_id)
|
||||
if not (user == current_user or current_user.is_administrator):
|
||||
|
@ -1,17 +0,0 @@
|
||||
from flask import request, url_for
|
||||
from app.models import User
|
||||
|
||||
|
||||
def user_endpoint_arguments_constructor():
|
||||
return {'user_id': request.view_args['user_id']}
|
||||
|
||||
|
||||
def user_dynamic_list_constructor():
|
||||
user_id = request.view_args['user_id']
|
||||
user = User.query.get_or_404(user_id)
|
||||
return [
|
||||
{
|
||||
'text': f'<i class="material-icons left">person</i>{user.username}',
|
||||
'url': url_for('.user', user_id=user_id)
|
||||
}
|
||||
]
|
Reference in New Issue
Block a user