From aa27e221a9650d5fae445aba9ef832328a609b41 Mon Sep 17 00:00:00 2001 From: GoEdgeLab Date: Thu, 28 Jan 2021 15:39:10 +0800 Subject: [PATCH] =?UTF-8?q?DNS=E6=9B=B4=E6=96=B0=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9F=9F=E5=90=8D=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/web/actions/default/dns/tasks/listPopup.go | 8 ++++++++ web/views/@default/dns/tasks/listPopup.html | 2 ++ 2 files changed, 10 insertions(+) diff --git a/internal/web/actions/default/dns/tasks/listPopup.go b/internal/web/actions/default/dns/tasks/listPopup.go index a66b07bd..fb766726 100644 --- a/internal/web/actions/default/dns/tasks/listPopup.go +++ b/internal/web/actions/default/dns/tasks/listPopup.go @@ -40,6 +40,7 @@ func (this *ListPopupAction) retrieveTasks() { var clusterMap maps.Map = nil var nodeMap maps.Map = nil var serverMap maps.Map = nil + var domainMap maps.Map = nil if task.NodeCluster != nil { clusterMap = maps.Map{ @@ -59,6 +60,12 @@ func (this *ListPopupAction) retrieveTasks() { "name": task.Server.Name, } } + if task.DnsDomain != nil { + domainMap = maps.Map{ + "id": task.DnsDomain.Id, + "name": task.DnsDomain.Name, + } + } taskMaps = append(taskMaps, maps.Map{ "id": task.Id, @@ -70,6 +77,7 @@ func (this *ListPopupAction) retrieveTasks() { "cluster": clusterMap, "node": nodeMap, "server": serverMap, + "domain": domainMap, }) } this.Data["tasks"] = taskMaps diff --git a/web/views/@default/dns/tasks/listPopup.html b/web/views/@default/dns/tasks/listPopup.html index 857f6c31..030f7375 100644 --- a/web/views/@default/dns/tasks/listPopup.html +++ b/web/views/@default/dns/tasks/listPopup.html @@ -18,11 +18,13 @@ {{task.cluster.name}} {{task.node.name}} {{task.server.name}} + {{task.domain.name}} 集群 节点 服务 + 域名 {{task.error}}