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

fix: fix data masking org problem

pull/16151/head
Aaron3S 2025-10-15 15:44:51 +08:00 committed by feng626
parent 1a9e56c520
commit 8f0a41b1a8
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/acls/api/data_masking.py
View File

@ -1,6 +1,5 @@
from common.api import JMSBulkModelViewSet from orgs.mixins.api import OrgBulkModelViewSet
from orgs.utils import tmp_to_root_org
from .common import ACLUserFilterMixin from .common import ACLUserFilterMixin
from ..models import DataMaskingRule from ..models import DataMaskingRule
from .. import serializers from .. import serializers
@ -15,12 +14,8 @@ class DataMaskingRuleFilter(ACLUserFilterMixin):
fields = ('name', 'action') fields = ('name', 'action')
class DataMaskingRuleViewSet(JMSBulkModelViewSet): class DataMaskingRuleViewSet(OrgBulkModelViewSet):
queryset = DataMaskingRule.objects.all() model = DataMaskingRule
filterset_class = DataMaskingRuleFilter filterset_class = DataMaskingRuleFilter
search_fields = ('name',) search_fields = ('name',)
serializer_class = serializers.DataMaskingRuleSerializer serializer_class = serializers.DataMaskingRuleSerializer
def filter_queryset(self, queryset):
with tmp_to_root_org():
return super().filter_queryset(queryset)

3
apps/acls/serializers/data_masking.py
View File

@ -3,12 +3,13 @@ from django.utils.translation import gettext_lazy as _
from acls.models import MaskingMethod, DataMaskingRule from acls.models import MaskingMethod, DataMaskingRule
from common.serializers.fields import LabeledChoiceField from common.serializers.fields import LabeledChoiceField
from common.serializers.mixin import CommonBulkModelSerializer from common.serializers.mixin import CommonBulkModelSerializer
from orgs.mixins.serializers import BulkOrgResourceModelSerializer
from .base import BaseUserAssetAccountACLSerializer as BaseSerializer from .base import BaseUserAssetAccountACLSerializer as BaseSerializer
__all__ = ['DataMaskingRuleSerializer'] __all__ = ['DataMaskingRuleSerializer']
class DataMaskingRuleSerializer(BaseSerializer, CommonBulkModelSerializer): class DataMaskingRuleSerializer(BaseSerializer, BulkOrgResourceModelSerializer):
masking_method = LabeledChoiceField( masking_method = LabeledChoiceField(
choices=MaskingMethod.choices, default=MaskingMethod.fixed_char, label=_('Masking Method') choices=MaskingMethod.choices, default=MaskingMethod.fixed_char, label=_('Masking Method')
) )