Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2026-02-17 12:07:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed inconsistencies in branch names on the Wiki (#3929)

Browse Source
This commit is contained in:
Yasumichi Akahoshi
2026-01-31 08:28:24 +09:00
committed by GitHub
parent 9a613bb678
commit 0bdc765198
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/scala/gitbucket/core/controller/WikiController.scala
View File

@@ -67,7 +67,8 @@ trait WikiControllerBase extends ControllerBase {
repository,
isEditable(repository),
getWikiPage(repository.owner, repository.name, "_Sidebar", branch),
getWikiPage(repository.owner, repository.name, "_Footer", branch)
getWikiPage(repository.owner, repository.name, "_Footer", branch),
branch
)
} getOrElse redirect(s"/${repository.owner}/${repository.name}/wiki/Home/_edit")
})
@@ -84,7 +85,8 @@ trait WikiControllerBase extends ControllerBase {
repository,
isEditable(repository),
getWikiPage(repository.owner, repository.name, "_Sidebar", branch),
getWikiPage(repository.owner, repository.name, "_Footer", branch)
getWikiPage(repository.owner, repository.name, "_Footer", branch),
branch
)
} getOrElse redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(pageName)}/_edit")
})

9
src/main/twirl/gitbucket/core/wiki/page.scala.html
View File

@@ -4,7 +4,8 @@
repository: gitbucket.core.service.RepositoryService.RepositoryInfo,
isEditable: Boolean,
sidebar: Option[gitbucket.core.service.WikiService.WikiPageInfo],
footer: Option[gitbucket.core.service.WikiService.WikiPageInfo])(implicit context: gitbucket.core.controller.Context)
footer: Option[gitbucket.core.service.WikiService.WikiPageInfo],
branch: String)(implicit context: gitbucket.core.controller.Context)
@import gitbucket.core.view.helpers
@import gitbucket.core.service.WikiService
@gitbucket.core.html.main(s"${pageName} - ${repository.owner}/${repository.name}", Some(repository)){
@@ -62,7 +63,7 @@
@helpers.renderMarkup(
filePath = sidebarPage.name.split("/").toList,
fileContent = sidebarPage.content,
branch = "master",
branch = branch,
repository = repository,
enableWikiLink = true,
enableRefsLink = false,
@@ -95,7 +96,7 @@
@helpers.renderMarkup(
filePath = page.name.split("/").toList,
fileContent = page.content,
branch = "master",
branch = branch,
repository = repository,
enableWikiLink = true,
enableRefsLink = false,
@@ -112,7 +113,7 @@
@helpers.renderMarkup(
filePath = footerPage.name.split("/").toList,
fileContent = footerPage.content,
branch = "master",
branch = branch,
repository = repository,
enableWikiLink = true,
enableRefsLink = false,