From 33d5cdedeadbf5cc37176dcc4bda3d6b02db739e Mon Sep 17 00:00:00 2001 From: jiangweidong Date: Thu, 9 Feb 2023 11:02:09 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/audits/serializers.py | 34 +++++++++++---------- apps/audits/signal_handlers/activity_log.py | 2 +- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/apps/audits/serializers.py b/apps/audits/serializers.py index ebe7394d9..bc260dbb7 100644 --- a/apps/audits/serializers.py +++ b/apps/audits/serializers.py @@ -128,20 +128,22 @@ class ActivityOperatorLogSerializer(serializers.Serializer): def get_detail_url(obj): detail_url = '' detail_id, obj_type = obj['r_detail_id'], obj['r_type'] - if detail_id: - if obj_type == ActivityChoices.operate_log: - detail_url = reverse( - view_name='audits:operate-log-detail', - kwargs={'pk': obj['id']}, - api_to_ui=True, is_audit=True - ) - elif obj_type == ActivityChoices.task: - detail_url = reverse( - 'ops:celery-task-log', kwargs={'pk': detail_id} - ) - elif obj_type == ActivityChoices.login_log: - detail_url = '%s?id=%s' % ( - reverse('api-audits:login-log-list', api_to_ui=True, is_audit=True), - detail_id - ) + if not detail_id: + return detail_url + + if obj_type == ActivityChoices.operate_log: + detail_url = reverse( + view_name='audits:operate-log-detail', + kwargs={'pk': obj['id']}, + api_to_ui=True, is_audit=True + ) + elif obj_type == ActivityChoices.task: + detail_url = reverse( + 'ops:celery-task-log', kwargs={'pk': detail_id} + ) + elif obj_type == ActivityChoices.login_log: + detail_url = '%s?id=%s' % ( + reverse('api-audits:login-log-list', api_to_ui=True, is_audit=True), + detail_id + ) return detail_url diff --git a/apps/audits/signal_handlers/activity_log.py b/apps/audits/signal_handlers/activity_log.py index 8a09935ef..ce1b99fe2 100644 --- a/apps/audits/signal_handlers/activity_log.py +++ b/apps/audits/signal_handlers/activity_log.py @@ -176,7 +176,7 @@ def on_object_created( 'UserLoginLog': activity_handler.login_log_for_activity } model_name = sender._meta.object_name - if not created or model_name not in handler_mapping.keys(): + if not created or model_name not in handler_mapping: return resource_id, detail, a_type = handler_mapping[model_name](instance)