mirror of
https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git
synced 2025-06-20 21:10:36 +00:00
Set default form values in view function. Use inheritance for admin forms
This commit is contained in:
@ -1,44 +1,15 @@
|
||||
from flask import current_app
|
||||
from flask_wtf import FlaskForm
|
||||
from wtforms import (BooleanField, SelectField, StringField, SubmitField,
|
||||
ValidationError)
|
||||
from wtforms.validators import DataRequired, Email, Length, Regexp
|
||||
from ..models import Role, User
|
||||
from flask_login import current_user
|
||||
from wtforms import BooleanField, SelectField
|
||||
from ..models import Role
|
||||
from ..settings.forms import EditGeneralSettingsForm
|
||||
|
||||
|
||||
class EditUserForm(FlaskForm):
|
||||
email = StringField('Email', validators=[DataRequired(), Email()])
|
||||
username = StringField(
|
||||
'Username',
|
||||
validators=[DataRequired(),
|
||||
Length(1, 64),
|
||||
Regexp(current_app.config['ALLOWED_USERNAME_REGEX'],
|
||||
message='Usernames must have only letters, numbers,'
|
||||
' dots or underscores')]
|
||||
)
|
||||
class EditGeneralSettingsAdminForm(EditGeneralSettingsForm):
|
||||
confirmed = BooleanField('Confirmed')
|
||||
role = SelectField(
|
||||
'Role',
|
||||
choices = [(role.id, role.name)
|
||||
for role in Role.query.order_by(Role.name).all()],
|
||||
coerce=int
|
||||
)
|
||||
submit = SubmitField('Update Profile')
|
||||
role = SelectField('Role', coerce=int)
|
||||
|
||||
def __init__(self, user, *args, **kwargs):
|
||||
super().__init__(*args, **kwargs)
|
||||
def __init__(self, user=current_user, *args, **kwargs):
|
||||
super().__init__(*args, user=user, **kwargs)
|
||||
self.role.choices = [(role.id, role.name)
|
||||
for role in Role.query.order_by(Role.name).all()]
|
||||
self.user = user
|
||||
self.email.data = self.email.data or user.email
|
||||
self.username.data = self.username.data or user.username
|
||||
self.confirmed.data = self.confirmed.data or user.confirmed
|
||||
self.role.data = self.role.data or user.role_id
|
||||
|
||||
def validate_email(self, field):
|
||||
if (field.data != self.user.email
|
||||
and User.query.filter_by(email=field.data).first()):
|
||||
raise ValidationError('Email already registered.')
|
||||
|
||||
def validate_username(self, field):
|
||||
if (field.data != self.user.username
|
||||
and User.query.filter_by(username=field.data).first()):
|
||||
raise ValidationError('Username already in use.')
|
||||
|
@ -1,7 +1,7 @@
|
||||
from flask import flash, redirect, render_template, url_for
|
||||
from flask_login import login_required
|
||||
from flask_login import current_user, login_required
|
||||
from . import admin
|
||||
from .forms import EditUserForm
|
||||
from .forms import EditGeneralSettingsAdminForm
|
||||
from .. import db
|
||||
from ..decorators import admin_required
|
||||
from ..models import Role, User
|
||||
@ -39,22 +39,29 @@ def delete_user(user_id):
|
||||
return redirect(url_for('admin.index'))
|
||||
|
||||
|
||||
@admin.route('/users/<int:user_id>/edit', methods=['GET', 'POST'])
|
||||
@admin.route('/users/<int:user_id>/edit_general_settings',
|
||||
methods=['GET', 'POST'])
|
||||
@login_required
|
||||
@admin_required
|
||||
def edit_user(user_id):
|
||||
def edit_general_settings(user_id):
|
||||
user = User.query.get_or_404(user_id)
|
||||
edit_user_form = EditUserForm(user=user)
|
||||
if edit_user_form.validate_on_submit():
|
||||
user.email = edit_user_form.email.data
|
||||
user.username = edit_user_form.username.data
|
||||
user.confirmed = edit_user_form.confirmed.data
|
||||
user.role = Role.query.get(edit_user_form.role.data)
|
||||
form = EditGeneralSettingsAdminForm(user=user)
|
||||
if form.validate_on_submit():
|
||||
user.setting_dark_mode = form.dark_mode.data
|
||||
user.email = form.email.data
|
||||
user.username = form.username.data
|
||||
user.confirmed = form.confirmed.data
|
||||
user.role = Role.query.get(form.role.data)
|
||||
db.session.add(user)
|
||||
db.session.commit()
|
||||
flash('The profile has been updated.')
|
||||
return redirect(url_for('admin.edit_user', user_id=user.id))
|
||||
return render_template('admin/edit_user.html.j2',
|
||||
edit_user_form=edit_user_form,
|
||||
title='Edit user',
|
||||
return redirect(url_for('admin.edit_general_settings', user_id=user.id))
|
||||
form.confirmed.data = user.confirmed
|
||||
form.dark_mode.data = user.setting_dark_mode
|
||||
form.email.data = user.email
|
||||
form.role.data = user.role_id
|
||||
form.username.data = user.username
|
||||
return render_template('admin/edit_general_settings.html.j2',
|
||||
form=form,
|
||||
title='General settings',
|
||||
user=user)
|
||||
|
Reference in New Issue
Block a user