From b4d7f66e29780306736912f3def2ba52a1876395 Mon Sep 17 00:00:00 2001 From: Nick Douma Date: Thu, 6 Aug 2020 16:33:00 +0200 Subject: [PATCH] Use Account.delete_account to also handle unlinking of Users --- powerdnsadmin/models/account.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/powerdnsadmin/models/account.py b/powerdnsadmin/models/account.py index cb394e2..54bc48e 100644 --- a/powerdnsadmin/models/account.py +++ b/powerdnsadmin/models/account.py @@ -98,7 +98,7 @@ class Account(db.Model): db.session.commit() return {'status': True, 'msg': 'Account updated successfully'} - def delete_account(self): + def delete_account(self, commit=True): """ Delete an account """ @@ -107,7 +107,8 @@ class Account(db.Model): try: Account.query.filter(Account.name == self.name).delete() - db.session.commit() + if commit: + db.session.commit() return True except Exception as e: db.session.rollback() @@ -239,7 +240,7 @@ class Account(db.Model): continue current_app.logger.info("Deleting account for {0}".format(account_name)) account = Account.query.get(account_id) - db.session.delete(account) + account.delete_account(commit=False) except Exception as e: current_app.logger.error( 'Can not delete account from DB. DETAIL: {0}'.format(e))