From 86fb4bb8d8fbdb9ec139deb5f46cc1bcb8f4cc55 Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 20 Aug 2021 14:56:49 +0800 Subject: [PATCH] fix: edit wiki name not exsit error --- routers/api/v1/repo/wiki.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/routers/api/v1/repo/wiki.go b/routers/api/v1/repo/wiki.go index 6b383add9..c851bc083 100644 --- a/routers/api/v1/repo/wiki.go +++ b/routers/api/v1/repo/wiki.go @@ -339,6 +339,11 @@ func EditWiki(ctx *context.APIContext, form api.WikiOption) { } wikiRepo, commit, _ := wikies.FindWikiRepoCommit(ctx) + if _, _, _, noEntry := wikies.WikiContentsByName(ctx, commit, oldWikiName); noEntry { + ctx.Error(http.StatusNotFound, "WikiNotFound", "wiki不存在") + return + } + if _, _, _, noEntry := wikies.WikiContentsByName(ctx, commit, newWikiName); oldWikiName != newWikiName && !noEntry { ctx.Error(http.StatusConflict, "WikiNameAlreadyExist", "wiki名称已存在") return @@ -352,7 +357,8 @@ func EditWiki(ctx *context.APIContext, form api.WikiOption) { ctx.Error(http.StatusInternalServerError, "EditWikiPage", err) return } - data, entry, pageFilename, _ := wikies.WikiContentsByName(ctx, commit, form.Name) + _, newCommit, _ := wikies.FindWikiRepoCommit(ctx) + data, entry, pageFilename, _ := wikies.WikiContentsByName(ctx, newCommit, newWikiName) c, err := wikiRepo.GetCommitByPath(entry.Name()) if err != nil { if models.IsErrWikiInvalidFileName(err) {