mirror of
https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git
synced 2025-06-12 09:00:40 +00:00
Set default form values in view function. Use inheritance for admin forms
This commit is contained in:
@ -4,6 +4,7 @@ from flask_wtf import FlaskForm
|
||||
from wtforms import (BooleanField, PasswordField, SelectField, StringField,
|
||||
SubmitField, ValidationError)
|
||||
from wtforms.validators import DataRequired, Email, EqualTo, Length, Regexp
|
||||
from ..models import User
|
||||
|
||||
|
||||
class ChangePasswordForm(FlaskForm):
|
||||
@ -43,9 +44,6 @@ class EditGeneralSettingsForm(FlaskForm):
|
||||
def __init__(self, user=current_user, *args, **kwargs):
|
||||
super().__init__(*args, **kwargs)
|
||||
self.user = user
|
||||
self.email.data = self.email.data or user.email
|
||||
self.dark_mode.data = self.dark_mode.data or user.setting_dark_mode
|
||||
self.username.data = self.username.data or user.username
|
||||
|
||||
def validate_email(self, field):
|
||||
if (field.data != self.user.email
|
||||
@ -78,9 +76,3 @@ class EditNotificationSettingsForm(FlaskForm):
|
||||
def __init__(self, user=current_user, *args, **kwargs):
|
||||
super().__init__(*args, **kwargs)
|
||||
self.user = user
|
||||
self.job_status_mail_notifications.data = \
|
||||
self.job_status_mail_notifications.data \
|
||||
or user.setting_job_status_mail_notifications
|
||||
self.job_status_site_notifications.data = \
|
||||
self.job_status_site_notifications.data \
|
||||
or user.setting_job_status_site_notifications
|
||||
|
@ -30,7 +30,7 @@ def change_password():
|
||||
title='Change password')
|
||||
|
||||
|
||||
@settings.route('/edit_general_settings')
|
||||
@settings.route('/edit_general_settings', methods=['GET', 'POST'])
|
||||
@login_required
|
||||
def edit_general_settings():
|
||||
form = EditGeneralSettingsForm()
|
||||
@ -40,12 +40,15 @@ def edit_general_settings():
|
||||
current_user.username = form.username.data
|
||||
db.session.commit()
|
||||
flash('Your changes have been saved.')
|
||||
form.dark_mode.data = current_user.setting_dark_mode
|
||||
form.email.data = current_user.email
|
||||
form.username.data = current_user.username
|
||||
return render_template('settings/edit_general_settings.html.j2',
|
||||
form=form,
|
||||
title='General settings')
|
||||
|
||||
|
||||
@settings.route('/edit_notification_settings')
|
||||
@settings.route('/edit_notification_settings', methods=['GET', 'POST'])
|
||||
@login_required
|
||||
def edit_notification_settings():
|
||||
form = EditNotificationSettingsForm()
|
||||
@ -56,6 +59,10 @@ def edit_notification_settings():
|
||||
form.job_status_site_notifications.data
|
||||
db.session.commit()
|
||||
flash('Your changes have been saved.')
|
||||
form.job_status_mail_notifications.data = \
|
||||
current_user.setting_job_status_mail_notifications
|
||||
form.job_status_site_notifications.data = \
|
||||
current_user.setting_job_status_site_notifications
|
||||
return render_template('settings/edit_notification_settings.html.j2',
|
||||
form=form,
|
||||
title='Notification settings')
|
||||
|
Reference in New Issue
Block a user