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

Merge pull request #2891 from jumpserver/dev_perms 

[Update] 修复Action转化的bug
pull/2893/head
老广 2019-07-06 15:10:16 +08:00 committed by GitHub
parent 0d72c4a7e0 a8c95093c4
commit eba8e54261
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
apps/perms/models/asset_permission.py
View File

@ -52,16 +52,20 @@ class Action:
@classmethod @classmethod
def choices_to_value(cls, value): def choices_to_value(cls, value):
if not value: if not isinstance(value, list):
return cls.NONE
db_value = [
cls.NAME_MAP_REVERSE[v] for v in value
if v in cls.NAME_MAP_REVERSE.keys()
]
if not db_value:
return cls.NONE return cls.NONE
if len(value) == 1:
return cls.NAME_MAP_REVERSE.get(value[0], cls.NONE)
def to_choices(x, y): def to_choices(x, y):
x = cls.NAME_MAP_REVERSE.get(x, cls.NONE)
y = cls.NAME_MAP_REVERSE.get(y, cls.NONE)
return x | y return x | y
return reduce(to_choices, value)
result = reduce(to_choices, db_value)
return result
@classmethod @classmethod
def choices(cls): def choices(cls):