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

fix: 资产登录规则操作日志显示优化

pull/10675/head
jiangweidong 2023-06-09 18:19:04 +08:00 committed by Jiangjie.Bai
parent 9574d03c12
commit ef2ecb225a
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/audits/handler.py
View File

@ -103,8 +103,6 @@ class OperatorLogHandler(metaclass=Singleton):
return '' return ''
if isinstance(value[0], str): if isinstance(value[0], str):
return ','.join(value) return ','.join(value)
if isinstance(value[0], dict) and value[0].get('value') and isinstance(value[0]['value'], str):
return ','.join([str(i['value']) for i in value])
return json.dumps(value) return json.dumps(value)
def __data_processing(self, dict_item, loop=True): def __data_processing(self, dict_item, loop=True):

3
apps/audits/utils.py
View File

@ -6,6 +6,7 @@ from django.db import models
from common.utils.timezone import as_current_tz from common.utils.timezone import as_current_tz
from common.utils import validate_ip, get_ip_city, get_logger from common.utils import validate_ip, get_ip_city, get_logger
from common.db.fields import RelatedManager
from .const import DEFAULT_CITY from .const import DEFAULT_CITY
logger = get_logger(__name__) logger = get_logger(__name__)
@ -53,6 +54,8 @@ def _get_instance_field_value(
value = dict(copy.deepcopy(value)) value = dict(copy.deepcopy(value))
elif isinstance(value, datetime): elif isinstance(value, datetime):
value = as_current_tz(value).strftime('%Y-%m-%d %H:%M:%S') value = as_current_tz(value).strftime('%Y-%m-%d %H:%M:%S')
elif isinstance(value, RelatedManager):
value = value.value
elif isinstance(f, models.OneToOneField) and isinstance(value, models.Model): elif isinstance(f, models.OneToOneField) and isinstance(value, models.Model):
nested_data = _get_instance_field_value( nested_data = _get_instance_field_value(
value, include_model_fields, model_need_continue_fields, ('id',) value, include_model_fields, model_need_continue_fields, ('id',)