Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2026-05-06 20:57:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove the getWikiSideBar service

Browse Source 
And use getWikiPage to avoid code repetition.
This commit is contained in:
Viliam Dias
2015-11-16 16:35:07 -02:00
parent 51acf72e0d
commit 9777d543b1
2 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,7 +39,7 @@ trait WikiControllerBase extends ControllerBase {
getWikiPage(repository.owner, repository.name, "Home").map { page =>
html.page("Home", page, getWikiPageList(repository.owner, repository.name),
repository, hasWritePermission(repository.owner, repository.name, context.loginAccount),
getWikiSideBar(repository.owner, repository.name))
getWikiPage(repository.owner, repository.name, "_Sidebar"))
} getOrElse redirect(s"/${repository.owner}/${repository.name}/wiki/Home/_edit")
})
@@ -49,7 +49,7 @@ trait WikiControllerBase extends ControllerBase {
getWikiPage(repository.owner, repository.name, pageName).map { page =>
html.page(pageName, page, getWikiPageList(repository.owner, repository.name),
repository, hasWritePermission(repository.owner, repository.name, context.loginAccount),
getWikiSideBar(repository.owner, repository.name))
getWikiPage(repository.owner, repository.name, "_Sidebar"))
} getOrElse redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(pageName)}/_edit")
})

14
src/main/scala/gitbucket/core/service/WikiService.scala
View File

@@ -71,20 +71,6 @@ trait WikiService {
}
}
/**
* Returns the wiki sidebar page.
*/
def getWikiSideBar(owner: String, repository: String): Option[WikiPageInfo] = {
using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
if(!JGitUtil.isEmpty(git)){
JGitUtil.getFileList(git, "master", ".").find(_.name == "_Sidebar.md").map { file =>
WikiPageInfo(file.name, StringUtil.convertFromByteArray(git.getRepository.open(file.id).getBytes),
file.author, file.time, file.commitId)
}
} else None
}
}
/**
* Returns the content of the specified file.
*/