Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into development

app/admin/routes.py

@@ -48,10 +48,12 @@ def user(user_id):
 def edit_user(user_id):
     user = User.query.get_or_404(user_id)
     admin_edit_user_form = AdminEditUserForm(
+        obj=user,
         prefix='admin-edit-user-form'
     )
     edit_general_settings_form = EditGeneralSettingsForm(
         user,
+        obj=user,
         prefix='edit-general-settings-form'
     )
     edit_notification_settings_form = EditNotificationSettingsForm(
@@ -81,8 +83,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))
-    admin_edit_user_form.prefill(user)
-    edit_general_settings_form.prefill(user)
     edit_notification_settings_form.prefill(user)
     return render_template(
         'admin/edit_user.html.j2',

app/static/js/Utils.js

@@ -544,7 +544,7 @@ class Utils {
               reject(response);
               break;
             default:
-              app.flash(msg, 'corpus');
+              app.flash(msg);
               resolve(response);
               break;
           }
@@ -575,7 +575,7 @@ class Utils {
               reject(response);
               break;
             default:
-              app.flash(msg, 'corpus');
+              app.flash(msg);
               resolve(response);
               break;
           }