diff --git a/apps/audits/api.py b/apps/audits/api.py index 513796ed9..3bf010ba4 100644 --- a/apps/audits/api.py +++ b/apps/audits/api.py @@ -149,7 +149,7 @@ class OperateLogViewSet(OrgReadonlyModelViewSet): return super().get_serializer_class() def get_queryset(self): - org_q = Q(org_id=Organization.SYSTEM_ID) | Q(org_id=current_org.id) + org_q = Q(org_id=current_org.id) with tmp_to_root_org(): qs = OperateLog.objects.filter(org_q) es_config = settings.OPERATE_LOG_ELASTICSEARCH_CONFIG diff --git a/apps/audits/serializers.py b/apps/audits/serializers.py index c6029e517..204d901e2 100644 --- a/apps/audits/serializers.py +++ b/apps/audits/serializers.py @@ -2,7 +2,7 @@ # from django.utils.translation import ugettext_lazy as _ from rest_framework import serializers - +from orgs.mixins.serializers import BulkOrgResourceModelSerializer from audits.backends.db import OperateLogStore from common.serializers.fields import LabeledChoiceField from common.utils import reverse, i18n_trans @@ -78,7 +78,7 @@ class OperateLogActionDetailSerializer(serializers.ModelSerializer): return data -class OperateLogSerializer(serializers.ModelSerializer): +class OperateLogSerializer(BulkOrgResourceModelSerializer): action = LabeledChoiceField(choices=ActionChoices.choices, label=_("Action")) resource = serializers.SerializerMethodField(label=_("Resource")) resource_type = serializers.SerializerMethodField(label=_('Resource Type')) diff --git a/apps/rbac/const.py b/apps/rbac/const.py index eeb09b46e..4ab48161c 100644 --- a/apps/rbac/const.py +++ b/apps/rbac/const.py @@ -135,7 +135,7 @@ only_system_permissions = ( ('xpack', 'license', '*', '*'), ('settings', 'setting', '*', '*'), ('tickets', '*', '*', '*'), - ('ops', 'task', 'view', 'taskmonitor'), + ('ops', 'celerytask', 'view', 'taskmonitor'), ('terminal', 'terminal', '*', '*'), ('terminal', 'commandstorage', '*', '*'), ('terminal', 'replaystorage', '*', '*'),