diff --git a/models/repo/repo.go b/models/repo/repo.go index 819356dfad..2c864bc4d5 100644 --- a/models/repo/repo.go +++ b/models/repo/repo.go @@ -164,6 +164,7 @@ type Repository struct { OriginalURL string `xorm:"VARCHAR(2048)"` DefaultBranch string DefaultWikiBranch string + DefaultWikiFormat string NumWatches int NumStars int diff --git a/routers/web/repo/setting/setting.go b/routers/web/repo/setting/setting.go index 60eb35f56d..c87c12c1ed 100644 --- a/routers/web/repo/setting/setting.go +++ b/routers/web/repo/setting/setting.go @@ -524,6 +524,9 @@ func handleSettingsPostAdvanced(ctx *context.Context) { deleteUnitTypes = append(deleteUnitTypes, unit_model.TypeCode) } + if form.EnableWiki && form.DefaultWikiFormat { + } + if form.EnableWiki && form.EnableExternalWiki && !unit_model.TypeExternalWiki.UnitGlobalDisabled() { if !validation.IsValidExternalURL(form.ExternalWikiURL) { ctx.Flash.Error(ctx.Tr("repo.settings.external_wiki_url_error")) diff --git a/services/forms/repo_form.go b/services/forms/repo_form.go index 6820521ba3..08a932aa3c 100644 --- a/services/forms/repo_form.go +++ b/services/forms/repo_form.go @@ -110,6 +110,7 @@ type RepoSettingForm struct { // Advanced settings EnableCode bool + DefaultWikiFormat string EnableWiki bool EnableExternalWiki bool DefaultWikiBranch string diff --git a/services/wiki/wiki_test.go b/services/wiki/wiki_test.go index e571e093b6..26c877b4d9 100644 --- a/services/wiki/wiki_test.go +++ b/services/wiki/wiki_test.go @@ -279,7 +279,7 @@ func TestPrepareWikiFileName(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { webPath := UserTitleToWebPath("", tt.arg) - existence, newWikiPath, err := prepareGitPath(gitRepo, repo.DefaultWikiBranch, webPath) + existence, newWikiPath, err := prepareGitPath(gitRepo, repo.DefaultWikiBranch, webPath, "both") if (err != nil) != tt.wantErr { assert.NoError(t, err) return @@ -310,7 +310,7 @@ func TestPrepareWikiFileName_FirstPage(t *testing.T) { defer gitRepo.Close() - existence, newWikiPath, err := prepareGitPath(gitRepo, "master", "Home") + existence, newWikiPath, err := prepareGitPath(gitRepo, "master", "Home", "both") assert.False(t, existence) assert.NoError(t, err) assert.Equal(t, "Home.md", newWikiPath)