Remove last edited date from FileMixin

This commit is contained in:
Patrick Jentsch
2022-11-24 12:24:29 +01:00
parent 28b1461ef9
commit aff85f2145
15 changed files with 133 additions and 127 deletions

View File

@ -11,8 +11,3 @@ class AdminEditUserForm(FlaskForm):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self.role.choices = [(x.hashid, x.name) for x in Role.query.all()]
def prefill(self, user):
''' Pre-fill the form with data of an exististing user '''
self.confirmed.data = user.confirmed
self.role.data = user.role.hashid

View File

@ -30,7 +30,7 @@ def index():
@bp.route('/users')
def users():
json_users = [x.to_json(backrefs=True) for x in User.query.all()]
json_users = [x.to_json_serializeable(backrefs=True) for x in User.query.all()]
return render_template(
'admin/users.html.j2',
json_users=json_users,
@ -48,15 +48,16 @@ def user(user_id):
def edit_user(user_id):
user = User.query.get_or_404(user_id)
admin_edit_user_form = AdminEditUserForm(
obj=user,
data={'confirmed': user.confirmed, 'role': user.role.hashid},
prefix='admin-edit-user-form'
)
edit_general_settings_form = EditGeneralSettingsForm(
user,
obj=user,
data=user.to_json_serializeable(),
prefix='edit-general-settings-form'
)
edit_notification_settings_form = EditNotificationSettingsForm(
data=user.to_json_serializeable(),
prefix='edit-notification-settings-form'
)
if (admin_edit_user_form.submit.data
@ -83,7 +84,6 @@ def edit_user(user_id):
db.session.commit()
flash('Your changes have been saved')
return redirect(url_for('.edit_user', user_id=user.id))
edit_notification_settings_form.prefill(user)
return render_template(
'admin/edit_user.html.j2',
admin_edit_user_form=admin_edit_user_form,