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

Merge pull request #10723 from jumpserver/pr@dev@perf_json_attr_m2m_filter 

perf: 优化 json m2m filter
pull/10724/head
老广 2023-06-15 09:40:39 +08:00 committed by GitHub
parent aad804f1af 40d8a71bf8
commit abd4e87bc2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -502,7 +502,7 @@ class JSONManyToManyDescriptor:
value = [value.id] value = [value.id]
value = set(map(str, value)) value = set(map(str, value))
rule_value = set(map(str, rule_value)) rule_value = set(map(str, rule_value))
res &= value.issubset(rule_value) res &= value & rule_value
else: else:
logging.error("unknown match: {}".format(rule['match'])) logging.error("unknown match: {}".format(rule['match']))
res &= False res &= False

6
apps/terminal/connect_methods.py
View File

@ -104,13 +104,15 @@ class NativeClient(TextChoices):
xpack_protocols = cls.xpack_protocols() xpack_protocols = cls.xpack_protocols()
for protocol, _clients in clients_map.items(): for protocol, _clients in clients_map.items():
if not settings.XPACK_ENABLED and protocol in xpack_protocols:
continue
if isinstance(_clients, dict): if isinstance(_clients, dict):
if os == 'all': if os == 'all':
_clients = list(itertools.chain(*_clients.values())) _clients = list(itertools.chain(*_clients.values()))
else: else:
_clients = _clients.get(os, _clients['default']) _clients = _clients.get(os, _clients['default'])
if protocol in xpack_protocols:
continue
for client in _clients: for client in _clients:
if not settings.XPACK_ENABLED and client in cls.xpack_methods(): if not settings.XPACK_ENABLED and client in cls.xpack_methods():
continue continue