From 153e898594f448915dc993e40f66b668f9e10936 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sun, 16 Mar 2025 13:14:16 -0700 Subject: [PATCH] Fix --- modules/gitrepo/wiki.go | 2 +- services/wiki/wiki.go | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/modules/gitrepo/wiki.go b/modules/gitrepo/wiki.go index e83bcbce9e..86636f1281 100644 --- a/modules/gitrepo/wiki.go +++ b/modules/gitrepo/wiki.go @@ -28,7 +28,7 @@ func OpenWikiRepository(ctx context.Context, repo Repository) (*git.Repository, // IsWikiRepositoryExist returns true if the repository directory exists in the disk func IsWikiRepositoryExist(ctx context.Context, repo Repository) (bool, error) { - return util.IsExist(wikiPath(repo)) + return util.IsDir(wikiPath(repo)) } // RenameRepository renames a repository's name on disk diff --git a/services/wiki/wiki.go b/services/wiki/wiki.go index cc6ce2222b..568004aaf4 100644 --- a/services/wiki/wiki.go +++ b/services/wiki/wiki.go @@ -365,7 +365,14 @@ func DeleteWiki(ctx context.Context, repo *repo_model.Repository) error { return err } - system_model.RemoveAllWithNotice(ctx, "Delete repository wiki", repo.WikiPath()) + if err := gitrepo.DeleteWikiRepository(ctx, repo); err != nil { + desc := fmt.Sprintf("Delete wiki repository files [%s]: %v", repo.FullName(), err) + // Note we use the db.DefaultContext here rather than passing in a context as the context may be cancelled + if err = system_model.CreateNotice(db.DefaultContext, system_model.NoticeRepository, desc); err != nil { + log.Error("CreateRepositoryNotice: %v", err) + } + } + return nil }