From 953adf6cfbe95aba0651b51a4b168da6c0fa0d21 Mon Sep 17 00:00:00 2001 From: Bai Date: Wed, 8 Feb 2023 14:12:52 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20(smart=20endpoint=20=E8=8E=B7=E5=8F=9650?= =?UTF-8?q?0=E7=9A=84=E9=97=AE=E9=A2=98)=20(=E4=BF=AE=E5=A4=8D=E7=9B=91?= =?UTF-8?q?=E6=8E=A7=E4=BC=9A=E8=AF=9D=E6=89=93=E5=BC=80=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/terminal/models/component/endpoint.py | 2 +- apps/terminal/models/session/session.py | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/apps/terminal/models/component/endpoint.py b/apps/terminal/models/component/endpoint.py index 47d7a7894..8699eb898 100644 --- a/apps/terminal/models/component/endpoint.py +++ b/apps/terminal/models/component/endpoint.py @@ -74,7 +74,7 @@ class Endpoint(JMSBaseModel): from assets.models import Asset from terminal.models import Session if isinstance(instance, Session): - instance = instance.get_asset_or_application() + instance = instance.get_asset() if not isinstance(instance, Asset): return None values = instance.labels.filter(name='endpoint').values_list('value', flat=True) diff --git a/apps/terminal/models/session/session.py b/apps/terminal/models/session/session.py index 0241f10e5..70513753d 100644 --- a/apps/terminal/models/session/session.py +++ b/apps/terminal/models/session/session.py @@ -178,14 +178,11 @@ class Session(OrgModelMixin): def login_from_display(self): return self.get_login_from_display() - def get_asset_or_application(self): - instance = get_object_or_none(Asset, pk=self.asset_id) - if not instance: - instance = get_object_or_none(Application, pk=self.asset_id) - return instance + def get_asset(self): + return get_object_or_none(Asset, pk=self.asset_id) def get_target_ip(self): - instance = self.get_asset_or_application() + instance = self.get_asset() target_ip = instance.get_target_ip() if instance else '' return target_ip