From 2e141d820a46e5f2dc46c7355aad3c6f579b8895 Mon Sep 17 00:00:00 2001 From: "m.huber" Date: Mon, 21 Jul 2025 22:26:40 +0200 Subject: [PATCH] fix --- routers/api/v1/repo/repo.go | 11 +++++++---- tests/integration/api_repo_edit_test.go | 3 +-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go index aed0a163a5e..946a3f21ebe 100644 --- a/routers/api/v1/repo/repo.go +++ b/routers/api/v1/repo/repo.go @@ -856,10 +856,13 @@ func updateRepoUnits(ctx *context.APIContext, opts api.EditRepoOption) error { Config: config, }) deleteUnitTypes = append(deleteUnitTypes, unit_model.TypeExternalWiki) - } else if !*opts.HasWiki && !unit_model.TypeExternalWiki.UnitGlobalDisabled() { - deleteUnitTypes = append(deleteUnitTypes, unit_model.TypeExternalWiki) - } else if !*opts.HasWiki && !unit_model.TypeWiki.UnitGlobalDisabled() { - deleteUnitTypes = append(deleteUnitTypes, unit_model.TypeWiki) + } else if !*opts.HasWiki { + if !unit_model.TypeExternalWiki.UnitGlobalDisabled() { + deleteUnitTypes = append(deleteUnitTypes, unit_model.TypeExternalWiki) + } + if !unit_model.TypeWiki.UnitGlobalDisabled() { + deleteUnitTypes = append(deleteUnitTypes, unit_model.TypeWiki) + } } } diff --git a/tests/integration/api_repo_edit_test.go b/tests/integration/api_repo_edit_test.go index 7de8910ee06..e228da26e99 100644 --- a/tests/integration/api_repo_edit_test.go +++ b/tests/integration/api_repo_edit_test.go @@ -53,9 +53,8 @@ func getRepoEditOptionFromRepo(repo *repo_model.Repository) *api.EditRepoOption hasWiki = true } else if unit, err := repo.GetUnit(db.DefaultContext, unit_model.TypeExternalWiki); err == nil { hasWiki = true - config := unit.ExternalWikiConfig() externalWiki = &api.ExternalWiki{ - ExternalWikiURL: config.ExternalWikiURL, + ExternalWikiURL: unit.ExternalWikiConfig().ExternalWikiURL, } } defaultBranch := repo.DefaultBranch