Use enums where appropriate. This commit includes new migrations that are NOT compatible with older nopaque instances

app/admin/forms.py

@@ -1,13 +1,16 @@
-from wtforms import BooleanField, SelectField
-from ..models import Role
-from ..settings.forms import EditGeneralSettingsForm
+from app.models import Role
+from flask_wtf import FlaskForm
+from wtforms import BooleanField, SelectField, SubmitField
 
 
-class EditGeneralSettingsAdminForm(EditGeneralSettingsForm):
+class AdminEditUserForm(FlaskForm):
     confirmed = BooleanField('Confirmed')
-    role = SelectField('Role', coerce=int)
+    role = SelectField('Role')
+    submit = SubmitField('Submit')
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.role.choices = [(role.id, role.name)
-                             for role in Role.query.order_by(Role.name).all()]
+        self.role.choices = [
+            (role.hashid, role.name)
+            for role in Role.query.order_by(Role.name).all()
+        ]

app/admin/routes.py

@@ -1,11 +1,16 @@
+from app import db, hashids
+from app.decorators import admin_required
+from app.models import JobStatusMailNotificationLevel, Role, User
+from app.settings import tasks as settings_tasks
+from app.settings.forms import (
+    EditGeneralSettingsForm,
+    EditInterfaceSettingsForm,
+    EditNotificationSettingsForm
+)
 from flask import flash, redirect, render_template, url_for
 from flask_login import login_required
 from . import bp
-from .forms import EditGeneralSettingsAdminForm
-from .. import db
-from ..decorators import admin_required
-from ..models import Role, User
-from ..settings import tasks as settings_tasks
+from .forms import AdminEditUserForm
 
 
 @bp.before_request
@@ -26,10 +31,15 @@ def index():
 
 @bp.route('/users')
 def users():
-    dict_users = {user.id: user.to_dict(backrefs=True, relationships=False)
-                  for user in User.query.all()}
+    dict_users = {
+        user.id: user.to_dict(backrefs=True, relationships=False)
+        for user in User.query.all()
+    }
     return render_template(
-        'admin/users.html.j2', title='Users', dict_users=dict_users)
+        'admin/users.html.j2',
+        dict_users=dict_users,
+        title='Users'
+    )
 
 
 @bp.route('/users/<hashid:user_id>')
@@ -41,27 +51,76 @@ def user(user_id):
 @bp.route('/users/<hashid:user_id>/delete')
 def delete_user(user_id):
     settings_tasks.delete_user(user_id)
-    flash('User has been marked for deletion!')
+    flash('User has been marked for deletion')
     return redirect(url_for('.users'))
 
 
-@bp.route('/users/<hashid:user_id>/edit', methods=['GET', 'POST'])  # noqa
+@bp.route('/users/<hashid:user_id>/edit', methods=['GET', 'POST'])
 def edit_user(user_id):
     user = User.query.get_or_404(user_id)
-    form = EditGeneralSettingsAdminForm(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.commit()
-        flash('Settings have been updated.')
+    admin_edit_user_form = AdminEditUserForm(
+        prefix='admin_edit_user_form'
+    )
+    edit_general_settings_form = EditGeneralSettingsForm(
+        user,
+        prefix='edit_general_settings_form'
+    )
+    edit_interface_settings_form = EditInterfaceSettingsForm(
+        prefix='edit_interface_settings_form'
+    )
+    edit_notification_settings_form = EditNotificationSettingsForm(
+        prefix='edit_notification_settings_form'
+    )
+    if (
+        admin_edit_user_form.submit.data
+        and admin_edit_user_form.validate()
+    ):
+        user.confirmed = admin_edit_user_form.confirmed.data
+        role_id = hashids.decode(admin_edit_user_form.role.data)
+        user.role = Role.query.get(role_id)
+        flash('Your changes have been saved')
         return redirect(url_for('.edit_user', 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
+    if (
+        edit_general_settings_form.submit.data
+        and edit_general_settings_form.validate()
+    ):
+        user.email = edit_general_settings_form.email.data
+        user.username = edit_general_settings_form.username.data
+        db.session.commit()
+        flash('Your changes have been saved')
+        return redirect(url_for('.edit_user', user_id=user.id))
+    if (
+        edit_interface_settings_form.submit.data
+        and edit_interface_settings_form.validate()
+    ):
+        user.setting_dark_mode = edit_interface_settings_form.dark_mode.data
+        db.session.commit()
+        flash('Your changes have been saved')
+        return redirect(url_for('.edit_user', user_id=user.id))
+    if (
+        edit_notification_settings_form.submit.data
+        and edit_notification_settings_form.validate()
+    ):
+        user.setting_job_status_mail_notification_level = \
+            JobStatusMailNotificationLevel[
+                edit_notification_settings_form.job_status_mail_notification_level.data  # noqa
+            ]
+        db.session.commit()
+        flash('Your changes have been saved')
+        return redirect(url_for('.edit_user', user_id=user.id))
+    admin_edit_user_form.confirmed.data = user.confirmed
+    admin_edit_user_form.role.data = user.role.hashid
+    edit_general_settings_form.email.data = user.email
+    edit_general_settings_form.username.data = user.username
+    edit_interface_settings_form.dark_mode.data = user.setting_dark_mode
+    edit_notification_settings_form.job_status_mail_notification_level.data = \
+        user.setting_job_status_mail_notification_level.name
     return render_template(
-        'admin/edit_user.html.j2', form=form, title='Edit user', user=user)
+        'admin/edit_user.html.j2',
+        admin_edit_user_form=admin_edit_user_form,
+        edit_general_settings_form=edit_general_settings_form,
+        edit_interface_settings_form=edit_interface_settings_form,
+        edit_notification_settings_form=edit_notification_settings_form,
+        title='Edit user',
+        user=user
+    )