From d73a40b734d429fdb3c2f46a1fc4159e6bb2ba75 Mon Sep 17 00:00:00 2001
From: Jonathan Miller <jmiller@mokoconsulting.tech>
Date: Tue, 14 Jul 2026 21:03:40 -0500
Subject: [PATCH 1/3] fix(org-wiki): remove duplicated nav menu, fix intra-wiki
 links

- view.tmpl rendered both org/header (which already includes org/menu)
  and org/menu -> the org navigation bar showed twice. Drop the redundant
  org/menu include to match every other org page.
- Wiki content was rendered with a RepoFile context, so intra-wiki links
  pointed at /{owner}/{repo}/src/branch/main/PATH (repo file browser,
  missing .md -> 404). Rewrite rendered links (content/sidebar/footer) to
  /{owner}/-/wiki/PATH, which also hides the underlying wiki repo name.
- Reword empty-state hint to public / members-only wording.

Claude-Session: https://claude.ai/code/session_01Bqe7fAuHQeiLueYfeHFrHw
---
 routers/web/org/wiki.go      | 25 +++++++++++++++++++++++--
 templates/org/wiki/view.tmpl |  4 +---
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/routers/web/org/wiki.go b/routers/web/org/wiki.go
index e6d76f08c3..53f5d41188 100644
--- a/routers/web/org/wiki.go
+++ b/routers/web/org/wiki.go
@@ -4,8 +4,10 @@
 package org
 
 import (
+	htmltemplate "html/template"
 	"net/http"
 	"path"
+	"regexp"
 	"strings"
 
 	"code.mokoconsulting.tech/MokoConsulting/MokoGitea/models/renderhelper"
@@ -114,6 +116,11 @@ func Wiki(ctx *context.Context) {
 		ctx.ServerError("RenderString", err)
 		return
 	}
+	// Intra-wiki links render as repo-file URLs (/{owner}/{repo}/src/branch/...).
+	// Rewrite them to the org wiki route so they open the wiki viewer instead of
+	// the repo file browser, and don't leak the underlying wiki repo name.
+	wikiLinkBase := setting.AppSubURL + "/" + org.Name + "/-/wiki/"
+	renderedContent = rewriteOrgWikiLinks(renderedContent, wikiRepo, wikiLinkBase)
 	ctx.Data["WikiContent"] = renderedContent
 
 	// Render _Sidebar if it exists.
@@ -123,7 +130,7 @@ func Wiki(ctx *context.Context) {
 		if err == nil {
 			rendered, err := markdown.RenderString(rctx, sidebarContent)
 			if err == nil {
-				ctx.Data["WikiSidebarHTML"] = rendered
+				ctx.Data["WikiSidebarHTML"] = rewriteOrgWikiLinks(rendered, wikiRepo, wikiLinkBase)
 			}
 		}
 	}
@@ -135,7 +142,7 @@ func Wiki(ctx *context.Context) {
 		if err == nil {
 			rendered, err := markdown.RenderString(rctx, footerContent)
 			if err == nil {
-				ctx.Data["WikiFooterHTML"] = rendered
+				ctx.Data["WikiFooterHTML"] = rewriteOrgWikiLinks(rendered, wikiRepo, wikiLinkBase)
 			}
 		}
 	}
@@ -143,6 +150,20 @@ func Wiki(ctx *context.Context) {
 	ctx.HTML(http.StatusOK, tplOrgWiki)
 }
 
+// rewriteOrgWikiLinks rewrites links produced by the RepoFile render context
+// (/{owner}/{repo}/src/branch/{branch}/PATH) into org wiki routes
+// (/{owner}/-/wiki/PATH), stripping a trailing .md, so intra-wiki links open the
+// wiki viewer instead of the repo file browser.
+func rewriteOrgWikiLinks(html htmltemplate.HTML, wikiRepo *repo_model.Repository, wikiBase string) htmltemplate.HTML {
+	prefix := wikiRepo.Link() + "/src/branch/" + util.PathEscapeSegments(wikiRepo.DefaultBranch) + "/"
+	re := regexp.MustCompile(`href="` + regexp.QuoteMeta(prefix) + `([^"#?]*)([^"]*)"`)
+	out := re.ReplaceAllStringFunc(string(html), func(m string) string {
+		sm := re.FindStringSubmatch(m)
+		return `href="` + wikiBase + strings.TrimSuffix(sm[1], ".md") + sm[2] + `"`
+	})
+	return htmltemplate.HTML(out)
+}
+
 // buildOrgWikiTree builds a hierarchical folder tree from the org wiki git repo.
 // Shows up to 2 levels deep (folders and their immediate children).
 func buildOrgWikiTree(commit *git.Commit) []*OrgWikiTreeNode {
diff --git a/templates/org/wiki/view.tmpl b/templates/org/wiki/view.tmpl
index de4020fb3f..ee0e1ecdd8 100644
--- a/templates/org/wiki/view.tmpl
+++ b/templates/org/wiki/view.tmpl
@@ -1,7 +1,6 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content organization wiki">
 	{{template "org/header" .}}
-	{{template "org/menu" .}}
 	<div class="ui container">
 		{{if .WikiEmpty}}
 			<div class="ui placeholder segment">
@@ -11,8 +10,7 @@
 					This organization doesn't have a wiki yet.
 				</div>
 				<p class="tw-text-center">
-					Enable the wiki on the <code>.mokogitea</code> (public) or <code>.mokogitea-private</code> (members-only)
-					repository to get started.
+					Enable a <strong>public</strong> or <strong>members-only</strong> wiki for this organization to get started.
 				</p>
 			</div>
 		{{else}}
-- 
2.52.0


From 31c58d34f19bc8a8d095c1ddec77dd75db62f7b9 Mon Sep 17 00:00:00 2001
From: Jonathan Miller <jmiller@mokoconsulting.tech>
Date: Tue, 14 Jul 2026 21:06:52 -0500
Subject: [PATCH 2/3] fix(org-wiki): also rewrite absolute-form intra-wiki
 links

Match an optional https://host prefix so wiki links rendered as absolute
URLs (not just root-relative) are rewritten to the /-/wiki/ route too.
Covers nested pages like standards/Wiki-Structure.

Claude-Session: https://claude.ai/code/session_01Bqe7fAuHQeiLueYfeHFrHw
---
 routers/web/org/wiki.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/routers/web/org/wiki.go b/routers/web/org/wiki.go
index 53f5d41188..510257d871 100644
--- a/routers/web/org/wiki.go
+++ b/routers/web/org/wiki.go
@@ -156,7 +156,7 @@ func Wiki(ctx *context.Context) {
 // wiki viewer instead of the repo file browser.
 func rewriteOrgWikiLinks(html htmltemplate.HTML, wikiRepo *repo_model.Repository, wikiBase string) htmltemplate.HTML {
 	prefix := wikiRepo.Link() + "/src/branch/" + util.PathEscapeSegments(wikiRepo.DefaultBranch) + "/"
-	re := regexp.MustCompile(`href="` + regexp.QuoteMeta(prefix) + `([^"#?]*)([^"]*)"`)
+	re := regexp.MustCompile(`href="(?:https?://[^/"]+)?` + regexp.QuoteMeta(prefix) + `([^"#?]*)([^"]*)"`)
 	out := re.ReplaceAllStringFunc(string(html), func(m string) string {
 		sm := re.FindStringSubmatch(m)
 		return `href="` + wikiBase + strings.TrimSuffix(sm[1], ".md") + sm[2] + `"`
-- 
2.52.0


From 3377e6895f1fbf54c71846108f90ba17308d2ce8 Mon Sep 17 00:00:00 2001
From: Jonathan Miller <jmiller@mokoconsulting.tech>
Date: Tue, 14 Jul 2026 20:43:52 -0500
Subject: [PATCH 3/3] fix(metadata): remove redundant Organization field from
 repo metadata page

The Organization value is derived from the org profile (repo owner) and
was shown as a read-only field; it added no value, so remove it entirely
from the settings page. The DerivedOrgName model method stays (API still
derives org on read). See #771.

Claude-Session: https://claude.ai/code/session_01Bqe7fAuHQeiLueYfeHFrHw
---
 routers/web/repo/setting/metadata.go  | 5 ++---
 templates/repo/settings/metadata.tmpl | 9 +--------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/routers/web/repo/setting/metadata.go b/routers/web/repo/setting/metadata.go
index 58abe8c548..c18838f5c4 100644
--- a/routers/web/repo/setting/metadata.go
+++ b/routers/web/repo/setting/metadata.go
@@ -40,9 +40,8 @@ func Metadata(ctx *context.Context) {
 		}
 	}
 	ctx.Data["Manifest"] = manifest
-	// Organization is derived from the org profile (repo owner), not stored.
-	// It is displayed read-only. See issue #771.
-	ctx.Data["DerivedOrg"] = ctx.Repo.Repository.DerivedOrgName(ctx)
+	// Organization is derived from the org profile (repo owner), not stored,
+	// and is no longer surfaced on the metadata page (redundant). See #771.
 
 	// Platform dropdown options come from the admin-configurable setting
 	// (Admin -> Metadata). Keep the repo's current value selectable even if it
diff --git a/templates/repo/settings/metadata.tmpl b/templates/repo/settings/metadata.tmpl
index 8914ac430b..ee398f36a3 100644
--- a/templates/repo/settings/metadata.tmpl
+++ b/templates/repo/settings/metadata.tmpl
@@ -6,8 +6,7 @@
 	<form class="ui form" method="post" action="{{.RepoLink}}/settings/metadata?action=manifest">
 		{{.CsrfTokenHtml}}
 
-		<div class="two fields">
-			<div class="field">
+		<div class="field">
 				{{if eq .Manifest.Platform "joomla"}}
 					<label>Element Name</label>
 					<input name="name" value="{{.Manifest.Name}}" placeholder="e.g. mokowaas">
@@ -16,12 +15,6 @@
 					<input name="name" value="{{.Manifest.Name}}" placeholder="Project name">
 				{{end}}
 			</div>
-			<div class="field">
-				<label>Organization</label>
-				<input value="{{.DerivedOrg}}" placeholder="Organization" readonly>
-				<p class="help">Derived from the organization profile (repository owner).</p>
-			</div>
-		</div>
 		<div class="three fields">
 			<div class="field">
 				<label>Version Prefix</label>
-- 
2.52.0