From 7ac90f8e99dbf763b0fe04a17d7eef19dd22cae8 Mon Sep 17 00:00:00 2001 From: grm Date: Fri, 18 Sep 2026 14:35:59 +0300 Subject: Revert "Special pages: a gallery page of the blog's images" This reverts commit 0fc470a. The feature was not wanted. Migration 00013 stays on disk because databases have already run it (goose refuses a missing applied migration); 00014 drops the column and table it added. Co-Authored-By: Claude Opus 5 Claude-Session: https://claude.ai/code/session_01Sd8UPWrvyYCLj97JexNw3A --- internal/web/handlers_blog.go | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'internal/web/handlers_blog.go') diff --git a/internal/web/handlers_blog.go b/internal/web/handlers_blog.go index 006129c..55cec2e 100644 --- a/internal/web/handlers_blog.go +++ b/internal/web/handlers_blog.go @@ -107,20 +107,6 @@ func (s *Server) renderPage(w http.ResponseWriter, r *http.Request, page *store. s.serverError(w, err) return } - v["page"] = page - if !page.ShowNotices { - v["notices"] = noNotices - } - if page.Kind == store.PageKindGallery { // a special page: its images instead of posts - images, err := blogStore(r).GalleryImages(r.Context(), page.ID, themeFiles(v["theme"].(Theme))) - if err != nil { - s.serverError(w, err) - return - } - v["images"] = images - s.render(w, r, "blog/gallery.html", v) - return - } n, per := pageNum(r), v["theme"].(Theme).PostsPerPage posts, total, err := blogStore(r).PublishedPosts(r.Context(), page.ID, per, (n-1)*per) if err != nil { @@ -129,7 +115,10 @@ func (s *Server) renderPage(w http.ResponseWriter, r *http.Request, page *store. } last := (total + per - 1) / per fillExcerpts(v["theme"].(Theme), posts) - v["posts"], v["pageNum"], v["lastPage"] = posts, n, last + v["page"], v["posts"], v["pageNum"], v["lastPage"] = page, posts, n, last + if !page.ShowNotices { + v["notices"] = noNotices + } // The pager appends ?p=N to base: no trailing slash, which /{page} would not match. v["base"] = "/" + page.Slug if page.IsHome { -- cgit v1.2.3