Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-07 14:05:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Show the correct name of the readme file (instead of showing always README.md).

Browse Source
This commit is contained in:
Tobias Roeser
2014-02-26 12:09:14 +01:00
parent 1f71619b6b
commit 2c14dfb781
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/app/RepositoryViewerController.scala
View File

@@ -276,7 +276,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
val readme = files.find { file => val readme = files.find { file =>
readmeFiles.contains(file.name.toLowerCase) readmeFiles.contains(file.name.toLowerCase)
}.map { file => }.map { file =>
StringUtil.convertFromByteArray(JGitUtil.getContent(Git.open(getRepositoryDir(repository.owner, repository.name)), file.id, true).get) file -> StringUtil.convertFromByteArray(JGitUtil.getContent(Git.open(getRepositoryDir(repository.owner, repository.name)), file.id, true).get)
} }
repo.html.files(revision, repository, repo.html.files(revision, repository,

6
src/main/twirl/repo/files.scala.html
View File

@@ -3,7 +3,7 @@
pathList: List[String], pathList: List[String],
latestCommit: util.JGitUtil.CommitInfo, latestCommit: util.JGitUtil.CommitInfo,
files: List[util.JGitUtil.FileInfo], files: List[util.JGitUtil.FileInfo],
readme: Option[String])(implicit context: app.Context) readme: Option[(util.JGitUtil.FileInfo, String)])(implicit context: app.Context)
@import context._ @import context._
@import view.helpers._ @import view.helpers._
@html.main(s"${repository.owner}/${repository.name}", Some(repository)) { @html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
@@ -77,9 +77,9 @@
</table> </table>
</div> </div>
@readme.map { content => @readme.map { case(file, content) =>
<div id="readme" class="box"> <div id="readme" class="box">
<div class="box-header">README.md</div> <div class="box-header">@file.name</div>
<div class="box-content markdown-body">@markdown(content, repository, false, false)</div> <div class="box-content markdown-body">@markdown(content, repository, false, false)</div>
</div> </div>
} }