github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-07-19 17:26:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9627 from jumpserver/pr@dev@fix_platform_activity_err

Browse Source 
fix: 平台Activity列表500
This commit is contained in:
老广 2023-02-19 20:31:27 +08:00 committed by GitHub
commit 2f1e60cf91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/audits/api.py
View File

@ -8,6 +8,7 @@ from rest_framework import generics
from rest_framework.mixins import ListModelMixin, CreateModelMixin, RetrieveModelMixin
from rest_framework.permissions import IsAuthenticated
from common.utils import is_uuid
from common.api import JMSGenericViewSet
from common.drf.filters import DatetimeRangeFilter
from common.plugins.es import QuerySet as ESQuerySet
@ -93,9 +94,10 @@ class ResourceActivityAPIView(generics.ListAPIView):
@staticmethod
def get_operate_log_qs(fields, limit=30, resource_id=None):
q = Q(resource_id=resource_id)
q, user = Q(resource_id=resource_id), None
if is_uuid(resource_id):
user = User.objects.filter(id=resource_id).first()
if user:
if user is not None:
q |= Q(user=str(user))
queryset = OperateLog.objects.filter(q).annotate(
r_type=Value(ActivityChoices.operate_log, CharField()),