From 10e2b4906424f586bae989cb63f8731bc62cc14f Mon Sep 17 00:00:00 2001 From: wonderful Date: Tue, 17 Aug 2021 14:45:45 +0800 Subject: [PATCH] fix:wikies --- modules/wikies/wiki.go | 6 ----- routers/api/v1/repo/wiki.go | 45 +------------------------------------ services/wiki/wiki.go | 2 +- 3 files changed, 2 insertions(+), 51 deletions(-) diff --git a/modules/wikies/wiki.go b/modules/wikies/wiki.go index 9cf39b378..fdc41afbf 100644 --- a/modules/wikies/wiki.go +++ b/modules/wikies/wiki.go @@ -290,13 +290,8 @@ func NewWikiPost(ctx *context.APIContext, form api.WikiOption) { } return } - //ctx.Redirect(ctx.Repo.RepoLink + "/wiki/" + wiki_service.NameToSubURL(wikiName)) } - - - - func EditWikiPost(ctx *context.APIContext, form api.WikiOption) { ctx.Data["Title"] = ctx.Tr("repo.wiki.new_page") ctx.Data["PageIsWiki"] = true @@ -313,6 +308,5 @@ func EditWikiPost(ctx *context.APIContext, form api.WikiOption) { ctx.ServerError("EditWikiPage", err) return } - } diff --git a/routers/api/v1/repo/wiki.go b/routers/api/v1/repo/wiki.go index 45b032ac4..622b6de08 100644 --- a/routers/api/v1/repo/wiki.go +++ b/routers/api/v1/repo/wiki.go @@ -103,7 +103,7 @@ func WikiList(ctx *context.APIContext) { } //根据创建时间,按最新的时间排序 sort.Slice(wikiesList,func(i, j int) bool{ - return wikiesList[i].Commit.Commiter.When > wikiesList[j].Commit.Commiter.When + return wikiesList[i].Commit.Commiter.When < wikiesList[j].Commit.Commiter.When }) ctx.JSON(http.StatusOK, wikiesList) } @@ -365,56 +365,13 @@ func DeleteWiki(ctx *context.APIContext) { // "500": // "$ref": "#/responses/noFound" - - wikiRepo, commit, err := wikies.FindWikiRepoCommit(ctx) - if err != nil { - if wikiRepo != nil { - wikiRepo.Close() - } - return - } - entries, err1 := commit.ListEntries() - if err1 != nil { - if wikiRepo != nil { - wikiRepo.Close() - } - return - } - wikies := make([]api.WikiMeta, 0, len(entries)) - for _, entry := range entries { - - name, err := wiki_service.FilenameToName(entry.Name()) - if err != nil { - if models.IsErrWikiInvalidFileName(err) { - continue - } - if wikiRepo != nil { - wikiRepo.Close() - } - return - } - wikies = append(wikies, api.WikiMeta{ - Name: name, - }) - - } wikiName := wiki_service.NormalizeWikiName(ctx.Params(":page")) if len(wikiName) == 0 { wikiName = "Home" } - //Does the file exist - for _, wiky := range wikies { - if wikiName == wiky.Name{ - continue - }else{ - ctx.FileExistError() - return - } - } err2 := wiki_service.DeleteWikiPage(ctx.User, ctx.Repo.Repository, wikiName) if err2 != nil{ - //ctx.Error(http.StatusInternalServerError,"DeleteWikiPage", err) ctx.FileExistError() return } diff --git a/services/wiki/wiki.go b/services/wiki/wiki.go index e60cf1003..c04a7f518 100644 --- a/services/wiki/wiki.go +++ b/services/wiki/wiki.go @@ -68,7 +68,7 @@ func FilenameToName(filename string) (string, error) { } // check filename func CheckFile(filename string) error { - if(len(filename) <= 50 ){ + if(len(filename) <= 150 ){ return nil }else { err := errors.New("The name is too long, please be less than 200 bytes")