From 000b399e0c74318b2cdd2be3958ac268a5210a3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Weber?= <mail@soeren-weber.de>
Date: Fri, 15 Jul 2022 21:36:41 +0200
Subject: [PATCH] tags: don't count tags if page is hidden #310

---
 layouts/partials/_taxonomy.html | 10 ++++++++--
 layouts/partials/page-meta.hugo |  6 ++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/layouts/partials/_taxonomy.html b/layouts/partials/_taxonomy.html
index 85a9ade413..fc5b5b02ef 100644
--- a/layouts/partials/_taxonomy.html
+++ b/layouts/partials/_taxonomy.html
@@ -5,8 +5,14 @@
 <h1>{{ if eq .Kind "term" }}{{ .Data.Singular | humanize }} {{ default "::" .Site.Params.titleSeparator }} {{ end }}{{ .Title }}</h1>
 <ul>
   {{- range .Data.Terms.Alphabetical }}
-    {{- if and .Page.Title (or (ne (.Page.Scratch.Get "relearnIsHiddenStem") true) (ne .Page.Site.Params.disableTagHiddenPages true) ) }}
-  <li><a href="{{ .Page.RelPermalink }}">{{ .Page.Title }}</a> ({{ len .Pages }})</li>
+    {{- $len := 0 }}
+    {{- range .Pages }}
+      {{- if and .Title (or (ne (.Scratch.Get "relearnIsHiddenStem") true) (ne .Site.Params.disableTagHiddenPages true) ) }}
+        {{- $len = add $len 1 }}
+      {{- end }}
+    {{- end }}
+    {{- if $len }}
+  <li><a href="{{ .Page.RelPermalink }}">{{ .Page.Title }}</a> ({{ $len }})</li>
     {{- end }}
   {{- else }}
     {{- range sort .Pages "Title" }}
diff --git a/layouts/partials/page-meta.hugo b/layouts/partials/page-meta.hugo
index 0e1b881a44..f3bcdd86a5 100644
--- a/layouts/partials/page-meta.hugo
+++ b/layouts/partials/page-meta.hugo
@@ -38,8 +38,10 @@
 	{{- $hidden_stem:= or $hidden_node .hiddenstem }}
 	{{- $hidden_current_stem:= or $hidden_node .hiddencurrent }}
 	{{- $hidden_from_current := or (and $hidden_node (not $isAncestor) (not $isSelf) ) (and .hiddencurrent (or $isPreSelf $isPostSelf $isDescendant) ) }}
-	{{- $currentNode.Scratch.SetInMap "relearnIsHiddenNode" .node.RelPermalink $hidden_node }}
-	{{- $currentNode.Scratch.SetInMap "relearnIsHiddenStem" .node.RelPermalink $hidden_stem }}
+	{{- if $isSelf }}
+		{{- $currentNode.Scratch.Set "relearnIsHiddenNode" $hidden_node }}
+		{{- $currentNode.Scratch.Set "relearnIsHiddenStem" $hidden_stem }}
+	{{- end}}
 	{{- $currentNode.Scratch.SetInMap "relearnIsHiddenFrom" .node.RelPermalink $hidden_current_stem }}
 
 	{{- if not $hidden_from_current }}