mirror of https://github.com/veops/cmdb.git
Delete user without soft delete
This commit is contained in:
parent
ed340a1c33
commit
44c99e0f2e
|
@ -39,9 +39,12 @@ class UserCRUD(object):
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def add(cls, **kwargs):
|
def add(cls, **kwargs):
|
||||||
existed = User.get_by(username=kwargs['username'], email=kwargs['email'])
|
existed = User.get_by(username=kwargs['username'])
|
||||||
existed and abort(400, ErrFormat.user_exists.format(kwargs['username']))
|
existed and abort(400, ErrFormat.user_exists.format(kwargs['username']))
|
||||||
|
|
||||||
|
existed = User.get_by(username=kwargs['email'])
|
||||||
|
existed and abort(400, ErrFormat.user_exists.format(kwargs['email']))
|
||||||
|
|
||||||
kwargs['nickname'] = kwargs.get('nickname') or kwargs['username']
|
kwargs['nickname'] = kwargs.get('nickname') or kwargs['username']
|
||||||
kwargs['block'] = 0
|
kwargs['block'] = 0
|
||||||
kwargs['key'], kwargs['secret'] = cls.gen_key_secret()
|
kwargs['key'], kwargs['secret'] = cls.gen_key_secret()
|
||||||
|
@ -103,7 +106,7 @@ class UserCRUD(object):
|
||||||
|
|
||||||
origin = user.to_dict()
|
origin = user.to_dict()
|
||||||
|
|
||||||
user.soft_delete()
|
user.delete()
|
||||||
|
|
||||||
UserCache.clean(user)
|
UserCache.clean(user)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue