github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: 修复创建

pull/9387/head^2
Bai 2023-02-01 14:58:49 +08:00 committed by Jiangjie.Bai
parent 66c58a2084
commit acab0b765c
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/audits/signal_handlers.py
View File

@ -121,8 +121,7 @@ def signal_of_operate_log_whether_continue(sender, instance, created, update_fie
if instance._meta.object_name == 'Terminal' and created: if instance._meta.object_name == 'Terminal' and created:
condition = False condition = False
# last_login 改变是最后登录日期, 每次登录都会改变 # last_login 改变是最后登录日期, 每次登录都会改变
if instance._meta.object_name == 'User' and \ if instance._meta.object_name == 'User' and update_fields and 'last_login' in update_fields:
update_fields and 'last_login' in update_fields:
condition = False condition = False
# 不在记录白名单中，跳过 # 不在记录白名单中，跳过
if sender._meta.object_name not in MODELS_NEED_RECORD: if sender._meta.object_name not in MODELS_NEED_RECORD:
@ -137,8 +136,10 @@ def on_object_pre_create_or_update(sender, instance=None, raw=False, using=None,
) )
if not ok: if not ok:
return return
instance_before_data = {'id': instance.id} # users.PrivateToken Model 没有 id 有 pk字段
raw_instance = type(instance).objects.filter(pk=instance.id).first() instance_id = getattr(instance, 'id', getattr(instance, 'pk', None))
instance_before_data = {'id': instance_id}
raw_instance = type(instance).objects.filter(pk=instance_id).first()
if raw_instance: if raw_instance:
instance_before_data = model_to_dict(raw_instance) instance_before_data = model_to_dict(raw_instance)
operate_log_id = str(uuid.uuid4()) operate_log_id = str(uuid.uuid4())