diff --git a/admin/freeposte/admin/views/admins.py b/admin/freeposte/admin/views/admins.py index 40316211..092babb7 100644 --- a/admin/freeposte/admin/views/admins.py +++ b/admin/freeposte/admin/views/admins.py @@ -22,7 +22,6 @@ def admin_create(): user = models.User.query.get(form.admin.data) if user: user.global_admin = True - db.session.add(user) db.session.commit() flask.flash('User %s is now admin' % user) return flask.redirect(flask.url_for('.admin_list')) @@ -37,7 +36,6 @@ def admin_delete(admin): user = models.User.query.get(admin) if user: user.global_admin = False - db.session.add(user) db.session.commit() flask.flash('User %s is no longer admin' % user) return flask.redirect(flask.url_for('.admin_list')) diff --git a/admin/freeposte/admin/views/aliases.py b/admin/freeposte/admin/views/aliases.py index 4c684e98..6dc3faab 100644 --- a/admin/freeposte/admin/views/aliases.py +++ b/admin/freeposte/admin/views/aliases.py @@ -45,7 +45,6 @@ def alias_edit(alias): wtforms_components.read_only(form.localpart) if form.validate_on_submit(): form.populate_obj(alias) - db.session.add(alias) db.session.commit() flask.flash('Alias %s updated' % alias) return flask.redirect( diff --git a/admin/freeposte/admin/views/domains.py b/admin/freeposte/admin/views/domains.py index 34838d37..b728d718 100644 --- a/admin/freeposte/admin/views/domains.py +++ b/admin/freeposte/admin/views/domains.py @@ -39,7 +39,6 @@ def domain_edit(domain_name): wtforms_components.read_only(form.name) if form.validate_on_submit(): form.populate_obj(domain) - db.session.add(domain) db.session.commit() flask.flash('Domain %s saved' % domain) return flask.redirect(flask.url_for('.domain_list')) diff --git a/admin/freeposte/admin/views/fetches.py b/admin/freeposte/admin/views/fetches.py index e584dbfb..f766f10f 100644 --- a/admin/freeposte/admin/views/fetches.py +++ b/admin/freeposte/admin/views/fetches.py @@ -38,7 +38,6 @@ def fetch_edit(fetch_id): form = forms.FetchForm(obj=fetch) if form.validate_on_submit(): form.populate_obj(fetch) - db.session.add(fetch) db.session.commit() flask.flash('Fetch configuration updated') return flask.redirect( diff --git a/admin/freeposte/admin/views/managers.py b/admin/freeposte/admin/views/managers.py index 4e5938bd..8084cada 100644 --- a/admin/freeposte/admin/views/managers.py +++ b/admin/freeposte/admin/views/managers.py @@ -24,7 +24,6 @@ def manager_create(domain_name): flask.flash('User %s is already manager' % user, 'error') else: domain.managers.append(user) - db.session.add(domain) db.session.commit() flask.flash('User %s can now manage %s' % (user, domain.name)) return flask.redirect( @@ -40,7 +39,6 @@ def manager_delete(manager): domain = utils.get_domain_admin(user.domain_name) if user in domain.managers: domain.managers.remove(user) - db.session.add(domain) db.session.commit() flask.flash('User %s can no longer manager %s' % (user, domain)) else: diff --git a/admin/freeposte/admin/views/users.py b/admin/freeposte/admin/views/users.py index db365146..ba76c5e9 100644 --- a/admin/freeposte/admin/views/users.py +++ b/admin/freeposte/admin/views/users.py @@ -49,7 +49,6 @@ def user_edit(user_email): form.populate_obj(user) if form.pw.data: user.set_password(form.pw.data) - db.session.add(user) db.session.commit() flask.flash('User %s updated' % user) return flask.redirect( @@ -76,7 +75,6 @@ def user_settings(user_email): form = forms.UserSettingsForm(obj=user) if form.validate_on_submit(): form.populate_obj(user) - db.session.add(user) db.session.commit() flask.flash('Settings updated for %s' % user) if user_email: @@ -96,7 +94,6 @@ def user_password(user_email): flask.flash('Passwords do not match', 'error') else: user.set_password(form.pw.data) - db.session.add(user) db.session.commit() flask.flash('Password updated for %s' % user) if user_email: @@ -116,7 +113,6 @@ def user_forward(user_email): user.forward = form.forward.data else: user.forward = None - db.session.add(user) db.session.commit() flask.flash('Forward destination updated for %s' % user) if user_email: @@ -133,7 +129,6 @@ def user_reply(user_email): form = forms.UserReplyForm(obj=user) if form.validate_on_submit(): form.populate_obj(user) - db.session.add(user) db.session.commit() flask.flash('Auto-reply message updated for %s' % user) if user_email: