add delete() to ModelMixin: do NOT use the session.delete(), somehow it does a "SET" before "DELETE"
This commit is contained in:
parent
a2225160d5
commit
1274dd589a
|
@ -41,7 +41,7 @@ def activate():
|
|||
login_user(user)
|
||||
|
||||
# activation code is to be used only once
|
||||
activation_code.delete()
|
||||
ActivationCode.delete(activation_code.id)
|
||||
db.session.commit()
|
||||
|
||||
flash("Your account has been activated", "success")
|
||||
|
|
|
@ -49,7 +49,7 @@ def reset_password():
|
|||
user.activated = True
|
||||
|
||||
# remove the reset password code
|
||||
reset_password_code.delete()
|
||||
ResetPasswordCode.delete(reset_password_code.id)
|
||||
|
||||
db.session.commit()
|
||||
login_user(user)
|
||||
|
|
|
@ -57,7 +57,7 @@ def client_detail(client_id):
|
|||
|
||||
# replace all uris. TODO: optimize this?
|
||||
for redirect_uri in client.redirect_uris:
|
||||
redirect_uri.delete()
|
||||
RedirectUri.delete(redirect_uri.id)
|
||||
|
||||
for uri in uris:
|
||||
RedirectUri.create(client_id=client_id, uri=uri)
|
||||
|
|
|
@ -21,7 +21,7 @@ def index():
|
|||
flash("You cannot remove this client", "warning")
|
||||
else:
|
||||
client_name = client.name
|
||||
client.delete()
|
||||
Client.delete(client.id)
|
||||
db.session.commit()
|
||||
LOG.d("Remove client %s", client)
|
||||
flash(f"Client {client_name} has been deleted successfully", "success")
|
||||
|
|
|
@ -57,8 +57,9 @@ class ModelMixin(object):
|
|||
def save(self):
|
||||
db.session.add(self)
|
||||
|
||||
def delete(self):
|
||||
db.session.delete(self)
|
||||
@classmethod
|
||||
def delete(cls, obj_id):
|
||||
cls.query.filter(cls.id == obj_id).delete()
|
||||
|
||||
def __repr__(self):
|
||||
values = ", ".join(
|
||||
|
|
|
@ -64,7 +64,7 @@ def get_access_token():
|
|||
db.session.add(oauth_token)
|
||||
|
||||
# Auth code can be used only once
|
||||
db.session.delete(auth_code)
|
||||
AuthorizationCode.delete(auth_code.id)
|
||||
|
||||
db.session.commit()
|
||||
|
||||
|
|
Loading…
Reference in New Issue