sporada/nopaque
1
0
Fork 0
mirror of https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git synced 2025-11-03 20:02:47 +00:00
Code Issues Projects Releases Wiki Activity

Fix errors from settings move

Browse Source
This commit is contained in:
Patrick Jentsch
2023-03-20 16:00:25 +01:00
parent 3d4403e997
commit 575eeae94a
6 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/settings/routes.py
View File

@@ -7,9 +7,8 @@ from flask import (
)
from flask_breadcrumbs import register_breadcrumb
from flask_login import current_user, login_required
import os
from app import db
from app.models import Avatar, Corpus, ProfilePrivacySettings, User
from app.models import Avatar, ProfilePrivacySettings
from . import bp
from .forms import (
ChangePasswordForm,
@@ -17,16 +16,12 @@ from .forms import (
EditProfileSettingsForm,
EditPublicProfileInformationForm
)
from .utils import user_endpoint_arguments_constructor as user_eac
@bp.route('/<hashid:user_id>/edit', methods=['GET', 'POST'])
@register_breadcrumb(bp, 'breadcrumbs.settings', '<i class="material-icons left">settings</i>Settings', endpoint_arguments_constructor=user_eac)
@bp.route('', methods=['GET', 'POST'])
@register_breadcrumb(bp, '.', '<i class="material-icons left">settings</i>Settings')
@login_required
def edit_profile(user_id):
user = User.query.get_or_404(user_id)
if not (user == current_user or current_user.is_administrator()):
abort(403)
def settings():
# region forms
edit_profile_settings_form = EditProfileSettingsForm(
current_user,
@@ -52,7 +47,7 @@ def edit_profile(user_id):
current_user.username = edit_profile_settings_form.username.data
db.session.commit()
flash('Profile settings updated')
return redirect(url_for('users.user', user_id=user.id))
return redirect(url_for('.settings'))
# endregion handle edit profile settings forms
# region handle edit public profile information form
if edit_public_profile_information_form.submit.data and edit_public_profile_information_form.validate():
@@ -80,29 +75,28 @@ def edit_profile(user_id):
current_user.website = edit_public_profile_information_form.website.data
current_user.full_name = edit_public_profile_information_form.full_name.data
db.session.commit()
flash('Profile settings updated')
return redirect(url_for('users.user', user_id=user.id))
flash('Your changes have been saved')
return redirect(url_for('.settings'))
# endregion handle edit public profile information form
# region handle change_password_form POST
if change_password_form.submit.data and change_password_form.validate():
current_user.password = change_password_form.new_password.data
db.session.commit()
flash('Your changes have been saved')
return redirect(url_for('.edit_profile', user_id=user.id))
return redirect(url_for('.settings'))
# endregion handle change_password_form POST
# region handle edit_notification_settings_form POST
if edit_notification_settings_form.submit and edit_notification_settings_form.validate():
current_user.setting_job_status_mail_notification_level = edit_notification_settings_form.job_status_mail_notification_level.data
db.session.commit()
flash('Your changes have been saved')
return redirect(url_for('.edit_profile', user_id=user.id))
return redirect(url_for('.settings'))
# endregion handle edit_notification_settings_form POST
return render_template(
'settings/edit_profile.html.j2',
'settings/settings.html.j2',
edit_profile_settings_form=edit_profile_settings_form,
edit_public_profile_information_form=edit_public_profile_information_form,
change_password_form=change_password_form,
edit_notification_settings_form=edit_notification_settings_form,
user=user,
title='Settings'
)