From 84ec5a7e915d0cb9b802b2d39188a6c375203b3d Mon Sep 17 00:00:00 2001 From: Nan Deng Date: Thu, 12 Jun 2014 17:35:20 -0700 Subject: [PATCH] rename var --- pages/containers.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pages/containers.go b/pages/containers.go index 2b7f3946..60034cec 100644 --- a/pages/containers.go +++ b/pages/containers.go @@ -49,9 +49,9 @@ var funcMap = template.FuncMap{ var pageTemplate *template.Template type pageData struct { - ContainerName string - ParentContainers []info.ContainerReference - Subcontainers []info.ContainerReference + ContainerName string + ParentContainers []info.ContainerReference + Subcontainers []info.ContainerReference Spec *info.ContainerSpec Stats []*info.ContainerStats MachineInfo *info.MachineInfo @@ -69,17 +69,17 @@ func init() { } // TODO(vmarmol): Escape this correctly. -func containerLink(containerRef info.ContainerReference, basenameOnly bool, cssClasses string) interface{} { +func containerLink(container info.ContainerReference, basenameOnly bool, cssClasses string) interface{} { var displayName string - containerName := containerRef.Name - if len(containerRef.Aliases) > 0 { - displayName = containerRef.Aliases[0] + containerName := container.Name + if len(container.Aliases) > 0 { + displayName = container.Aliases[0] } else if basenameOnly { - displayName = path.Base(string(containerRef.Name)) + displayName = path.Base(string(container.Name)) } else { - displayName = string(containerRef.Name) + displayName = string(container.Name) } - if containerRef.Name == "root" { + if container.Name == "root" { containerName = "/" } return template.HTML(fmt.Sprintf("%s", cssClasses, ContainersPage[:len(ContainersPage)-1], containerName, displayName))