diff --git a/apps/acls/models/base.py b/apps/acls/models/base.py index 4649cd626..2624e34cd 100644 --- a/apps/acls/models/base.py +++ b/apps/acls/models/base.py @@ -1,7 +1,7 @@ from django.core.validators import MinValueValidator, MaxValueValidator from django.db import models from django.db.models import Q -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from common.db.models import JMSBaseModel from common.utils import contains_ip diff --git a/apps/acls/serializers/login_acl.py b/apps/acls/serializers/login_acl.py index fb826361a..74677b84b 100644 --- a/apps/acls/serializers/login_acl.py +++ b/apps/acls/serializers/login_acl.py @@ -1,12 +1,13 @@ from django.utils.translation import ugettext as _ from rest_framework import serializers -from common.serializers.fields import ObjectRelatedField, LabeledChoiceField from common.serializers import BulkModelSerializer, MethodSerializer +from common.serializers.fields import ObjectRelatedField, LabeledChoiceField from jumpserver.utils import has_valid_xpack_license from users.models import User from .rules import RuleSerializer from ..models import LoginACL +from ..models.base import ActionChoices __all__ = [ "LoginACLSerializer", @@ -22,7 +23,7 @@ class LoginACLSerializer(BulkModelSerializer): reviewers = ObjectRelatedField( queryset=User.objects, label=_("Reviewers"), many=True, required=False ) - action = LabeledChoiceField(choices=LoginACL.ActionChoices.choices, label=_('Action')) + action = LabeledChoiceField(choices=ActionChoices.choices, label=_('Action')) reviewers_amount = serializers.IntegerField( read_only=True, source="reviewers.count", label=_("Reviewers amount") ) @@ -55,7 +56,7 @@ class LoginACLSerializer(BulkModelSerializer): choices = action.choices if not has_valid_xpack_license(): choices.pop(LoginACL.ActionChoices.review, None) - action.choices = choices + action._choices = choices def get_rules_serializer(self): return RuleSerializer()