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

fix: 将flower放到web服务中；修复账号列表过滤节点的逻辑，获取所有子节点。

pull/6675/head
Bai 2021-08-18 14:51:16 +08:00 committed by Jiangjie.Bai
parent 0e9079fa2e
commit aa37d86959
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/assets/api/accounts.py
View File

@ -40,7 +40,7 @@ class AccountFilterSet(BaseFilterSet):
if not node_id: if not node_id:
return qs return qs
node = get_object_or_404(Node, pk=node_id) node = get_object_or_404(Node, pk=node_id)
node_ids = node.get_children(with_self=True).values_list('id', flat=True) node_ids = node.get_all_children(with_self=True).values_list('id', flat=True)
node_ids = list(node_ids) node_ids = list(node_ids)
qs = qs.filter(asset__nodes__in=node_ids) qs = qs.filter(asset__nodes__in=node_ids)
return qs return qs

4
apps/common/management/commands/services/command.py
View File

@ -36,7 +36,7 @@ class Services(TextChoices):
@classmethod @classmethod
def web_services(cls): def web_services(cls):
return [cls.gunicorn, cls.daphne] return [cls.gunicorn, cls.daphne, cls.flower]
@classmethod @classmethod
def celery_services(cls): def celery_services(cls):
@ -44,7 +44,7 @@ class Services(TextChoices):
@classmethod @classmethod
def task_services(cls): def task_services(cls):
return cls.celery_services() + [cls.beat, cls.flower] return cls.celery_services() + [cls.beat]
@classmethod @classmethod
def all_services(cls): def all_services(cls):