Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Render aliases even if render=link #7833

Merged
merged 1 commit into from
Oct 14, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions hugolib/content_map.go
Original file line number Diff line number Diff line change
Expand Up @@ -830,6 +830,13 @@ var (
}
return n.p.m.noRender()
}

contentTreeNoLinkFilter = func(s string, n *contentNode) bool {
if n.p == nil {
return true
}
return n.p.m.noLink()
}
)

func (c *contentTree) WalkQuery(query pageMapQuery, walkFn contentTreeNodeCallback) {
Expand Down Expand Up @@ -865,6 +872,13 @@ func (c contentTrees) WalkRenderable(fn contentTreeNodeCallback) {
}
}

func (c contentTrees) WalkLinkable(fn contentTreeNodeCallback) {
query := pageMapQuery{Filter: contentTreeNoLinkFilter}
for _, tree := range c {
tree.WalkQuery(query, fn)
}
}

func (c contentTrees) Walk(fn contentTreeNodeCallback) {
for _, tree := range c {
tree.Walk(func(s string, v interface{}) bool {
Expand Down
7 changes: 6 additions & 1 deletion hugolib/disableKinds_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ _build:
"sect/no-render-link.md", `
---
title: No Render Link
aliases: ["/link-alias"]
_build:
render: link
---
Expand Down Expand Up @@ -319,10 +320,14 @@ title: Headless Local Lists Sub
p := getPage(b, ref)
b.Assert(p, qt.Not(qt.IsNil))
b.Assert(p.RelPermalink(), qt.Equals, "/blog/sect/no-render-link/")
b.Assert(p.OutputFormats(), qt.HasLen, 0)
b.Assert(p.OutputFormats(), qt.HasLen, 1)
b.Assert(getPageInSitePages(b, ref), qt.Not(qt.IsNil))
sect := getPage(b, "/sect")
b.Assert(getPageInPagePages(sect, ref), qt.Not(qt.IsNil))

// https://github.com/gohugoio/hugo/issues/7832
// It should still render any aliases.
b.AssertFileContent("public/link-alias/index.html", "refresh")
})

c.Run("Build config, no publish resources", func(c *qt.C) {
Expand Down
2 changes: 1 addition & 1 deletion hugolib/page__paths.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ func newPagePaths(
}

var out page.OutputFormats
if !pm.noRender() {
if !pm.noLink() {
out = pageOutputFormats
}

Expand Down
14 changes: 11 additions & 3 deletions hugolib/site_render.go
Original file line number Diff line number Diff line change
Expand Up @@ -323,20 +323,28 @@ func (s *Site) renderRobotsTXT() error {
// renderAliases renders shell pages that simply have a redirect in the header.
func (s *Site) renderAliases() error {
var err error
s.pageMap.pageTrees.WalkRenderable(func(ss string, n *contentNode) bool {
s.pageMap.pageTrees.WalkLinkable(func(ss string, n *contentNode) bool {
p := n.p
if len(p.Aliases()) == 0 {
return false
}

pathSeen := make(map[string]bool)

for _, of := range p.OutputFormats() {
if !of.Format.IsHTML {
return false
continue
}

plink := of.Permalink()
f := of.Format

if pathSeen[f.Path] {
continue
}
pathSeen[f.Path] = true

plink := of.Permalink()

for _, a := range p.Aliases() {
isRelative := !strings.HasPrefix(a, "/")

Expand Down