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

fix: action

pull/9090/head
feng 2022-11-16 19:35:16 +08:00
parent 21d24ae4bc
commit ec462e09e0
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/common/drf/fields.py
View File

@ -162,6 +162,8 @@ class BitChoicesField(TreeChoicesMixin, serializers.MultipleChoiceField):
这里将获取到的值再执行一下 to_internal_value 方法, 转化为内部值 这里将获取到的值再执行一下 to_internal_value 方法, 转化为内部值
""" """
data = super().run_validation(data) data = super().run_validation(data)
if isinstance(data, int):
return data
value = self.to_internal_value(data) value = self.to_internal_value(data)
self.run_validators(value) self.run_validators(value)
return value return value

5
apps/common/utils/integer.py
View File

@ -1,5 +1,4 @@
def bit(x): def bit(x):
if x == 0: if x < 1:
return 0 raise ValueError("x must be greater than 1")
else:
return 2 ** (x - 1) return 2 ** (x - 1)

10
apps/perms/const.py
View File

@ -10,11 +10,11 @@ __all__ = ["ActionChoices"]
class ActionChoices(BitChoices): class ActionChoices(BitChoices):
connect = bit(0), _("Connect") connect = bit(1), _("Connect")
upload = bit(1), _("Upload") upload = bit(2), _("Upload")
download = bit(2), _("Download") download = bit(3), _("Download")
copy = bit(3), _("Copy") copy = bit(4), _("Copy")
paste = bit(4), _("Paste") paste = bit(5), _("Paste")
@classmethod @classmethod
def is_tree(cls): def is_tree(cls):