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

fix: 修复xpack引入包问题

pull/7118/head
feng626 2021-10-29 15:29:57 +08:00 committed by Jiangjie.Bai
parent d44f90ea3d
commit 8071f45f92
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/acls/serializers/login_acl.py
View File

@ -2,6 +2,7 @@ from django.utils.translation import ugettext as _
from rest_framework import serializers from rest_framework import serializers
from common.drf.serializers import BulkModelSerializer from common.drf.serializers import BulkModelSerializer
from common.drf.serializers import MethodSerializer from common.drf.serializers import MethodSerializer
from jumpserver.utils import has_valid_xpack_license
from ..models import LoginACL from ..models import LoginACL
from .rules import RuleSerializer from .rules import RuleSerializer
@ -40,12 +41,11 @@ class LoginACLSerializer(BulkModelSerializer):
self.set_action_choices() self.set_action_choices()
def set_action_choices(self): def set_action_choices(self):
from xpack.plugins.license.models import License
action = self.fields.get('action') action = self.fields.get('action')
if not action: if not action:
return return
choices = action._choices choices = action._choices
if not License.has_valid_license(): if not has_valid_xpack_license():
choices.pop(LoginACL.ActionChoices.confirm, None) choices.pop(LoginACL.ActionChoices.confirm, None)
action._choices = choices action._choices = choices