From 8071f45f9209b3b06d37aada174dfb1d9520538d Mon Sep 17 00:00:00 2001 From: feng626 <1304903146@qq.com> Date: Fri, 29 Oct 2021 15:29:57 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dxpack=E5=BC=95?= =?UTF-8?q?=E5=85=A5=E5=8C=85=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/acls/serializers/login_acl.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/acls/serializers/login_acl.py b/apps/acls/serializers/login_acl.py index cf40e078b..a699ae1ea 100644 --- a/apps/acls/serializers/login_acl.py +++ b/apps/acls/serializers/login_acl.py @@ -2,6 +2,7 @@ from django.utils.translation import ugettext as _ from rest_framework import serializers from common.drf.serializers import BulkModelSerializer from common.drf.serializers import MethodSerializer +from jumpserver.utils import has_valid_xpack_license from ..models import LoginACL from .rules import RuleSerializer @@ -40,12 +41,11 @@ class LoginACLSerializer(BulkModelSerializer): self.set_action_choices() def set_action_choices(self): - from xpack.plugins.license.models import License action = self.fields.get('action') if not action: return choices = action._choices - if not License.has_valid_license(): + if not has_valid_xpack_license(): choices.pop(LoginACL.ActionChoices.confirm, None) action._choices = choices