From aa37d86959444faf6bfedced4a2a7e25f3bc3ef0 Mon Sep 17 00:00:00 2001 From: Bai Date: Wed, 18 Aug 2021 14:51:16 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B0=86flower=E6=94=BE=E5=88=B0web?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E4=B8=AD=EF=BC=9B=E4=BF=AE=E5=A4=8D=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7=E5=88=97=E8=A1=A8=E8=BF=87=E6=BB=A4=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E7=9A=84=E9=80=BB=E8=BE=91=EF=BC=8C=E8=8E=B7=E5=8F=96=E6=89=80?= =?UTF-8?q?=E6=9C=89=E5=AD=90=E8=8A=82=E7=82=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/api/accounts.py | 2 +- apps/common/management/commands/services/command.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/assets/api/accounts.py b/apps/assets/api/accounts.py index ecd397dd6..778916e64 100644 --- a/apps/assets/api/accounts.py +++ b/apps/assets/api/accounts.py @@ -40,7 +40,7 @@ class AccountFilterSet(BaseFilterSet): if not node_id: return qs 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) qs = qs.filter(asset__nodes__in=node_ids) return qs diff --git a/apps/common/management/commands/services/command.py b/apps/common/management/commands/services/command.py index 230d59e10..170eb69ae 100644 --- a/apps/common/management/commands/services/command.py +++ b/apps/common/management/commands/services/command.py @@ -36,7 +36,7 @@ class Services(TextChoices): @classmethod def web_services(cls): - return [cls.gunicorn, cls.daphne] + return [cls.gunicorn, cls.daphne, cls.flower] @classmethod def celery_services(cls): @@ -44,7 +44,7 @@ class Services(TextChoices): @classmethod def task_services(cls): - return cls.celery_services() + [cls.beat, cls.flower] + return cls.celery_services() + [cls.beat] @classmethod def all_services(cls):