From 2690e18dae9309657d3e431aacdec84c247fccec Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Fri, 28 Apr 2023 13:05:05 +0800 Subject: [PATCH 1/4] Don't display creating page button in a mirror wiki repository --- routers/web/repo/wiki.go | 1 + 1 file changed, 1 insertion(+) diff --git a/routers/web/repo/wiki.go b/routers/web/repo/wiki.go index 374d1bf2e0691..b7c296746642e 100644 --- a/routers/web/repo/wiki.go +++ b/routers/web/repo/wiki.go @@ -575,6 +575,7 @@ func WikiPages(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("repo.wiki.pages") ctx.Data["CanWriteWiki"] = ctx.Repo.CanWrite(unit.TypeWiki) && !ctx.Repo.Repository.IsArchived + ctx.Data["IsRepositoryMirror"] = ctx.Repo.Repository.IsMirror wikiRepo, commit, err := findWikiRepoCommit(ctx) if err != nil { From 950fce64e2685d256f7a663c4c44efd9666e1d30 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Fri, 28 Apr 2023 13:35:48 +0800 Subject: [PATCH 2/4] Update the mirror setting button text --- options/locale/locale_en-US.ini | 1 + templates/repo/settings/options.tmpl | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 3fff13c5a27ef..b59b75c13c8b9 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1901,6 +1901,7 @@ settings.sync_mirror = Synchronize Now settings.mirror_sync_in_progress = Mirror synchronization is in progress. Check back in a minute. settings.site = Website settings.update_settings = Update Settings +settings.update_mirror_settings = Update Mirror Settings settings.branches.update_default_branch = Update Default Branch settings.branches.add_new_rule = Add New Rule settings.advanced_settings = Advanced Settings diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index 515854609a1eb..189441b466ced 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -153,7 +153,7 @@ {{end}}
- +
From 246fadd59090fb0e6376b8ca580856181e9da1d9 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Fri, 28 Apr 2023 14:42:30 +0800 Subject: [PATCH 3/4] Use repository in templ --- routers/web/repo/wiki.go | 1 - templates/repo/wiki/pages.tmpl | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/routers/web/repo/wiki.go b/routers/web/repo/wiki.go index b7c296746642e..374d1bf2e0691 100644 --- a/routers/web/repo/wiki.go +++ b/routers/web/repo/wiki.go @@ -575,7 +575,6 @@ func WikiPages(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("repo.wiki.pages") ctx.Data["CanWriteWiki"] = ctx.Repo.CanWrite(unit.TypeWiki) && !ctx.Repo.Repository.IsArchived - ctx.Data["IsRepositoryMirror"] = ctx.Repo.Repository.IsMirror wikiRepo, commit, err := findWikiRepoCommit(ctx) if err != nil { diff --git a/templates/repo/wiki/pages.tmpl b/templates/repo/wiki/pages.tmpl index 97abf9b5436f8..f27f43d4c8cce 100644 --- a/templates/repo/wiki/pages.tmpl +++ b/templates/repo/wiki/pages.tmpl @@ -5,7 +5,7 @@

{{.locale.Tr "repo.wiki.pages"}} - {{if and .CanWriteWiki (not .IsRepositoryMirror)}} + {{if and .CanWriteWiki (not .Repository.HasWiki)}} {{.locale.Tr "repo.wiki.new_page_button"}} {{end}} From f0928d819c2d20977525e9d20eb61a4e09e61a1f Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Wed, 3 May 2023 22:33:15 +0800 Subject: [PATCH 4/4] Fix template --- templates/repo/wiki/pages.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/wiki/pages.tmpl b/templates/repo/wiki/pages.tmpl index f27f43d4c8cce..6169109ce921e 100644 --- a/templates/repo/wiki/pages.tmpl +++ b/templates/repo/wiki/pages.tmpl @@ -5,7 +5,7 @@

{{.locale.Tr "repo.wiki.pages"}} - {{if and .CanWriteWiki (not .Repository.HasWiki)}} + {{if and .CanWriteWiki (not .Repository.IsMirror)}} {{.locale.Tr "repo.wiki.new_page_button"}} {{end}}