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

Fix content-type of get-contents API

Browse Source
This commit is contained in:
Keiichi Watanabe
2016-12-19 01:56:42 +09:00
parent ffb9bb10f5
commit 668f9ef919
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/scala/gitbucket/core/controller/ApiController.scala
View File

@@ -133,9 +133,12 @@ trait ApiControllerBase extends ControllerBase {
val largeFile = params.get("large_file").exists(s => s.equals("true"))
val content = getContentFromId(git, f.id, largeFile)
request.getHeader("Accept") match {
case "application/vnd.github.v3.raw" =>
case "application/vnd.github.v3.raw" => {
contentType = "application/vnd.github.v3.raw"
content
case "application/vnd.github.v3.html" if isRenderable(f.name) =>
}
case "application/vnd.github.v3.html" if isRenderable(f.name) => {
contentType = "application/vnd.github.v3.html"
content.map(c =>
List(
"<div data-path=\"", path, "\" id=\"file\">", "<article>",
@@ -143,7 +146,9 @@ trait ApiControllerBase extends ControllerBase {
"</article>", "</div>"
).mkString
)
case "application/vnd.github.v3.html" =>
}
case "application/vnd.github.v3.html" => {
contentType = "application/vnd.github.v3.html"
content.map(c =>
List(
"<div data-path=\"", path, "\" id=\"file\">", "<div class=\"plain\">", "<pre>",
@@ -151,6 +156,7 @@ trait ApiControllerBase extends ControllerBase {
"</pre>", "</div>", "</div>"
).mkString
)
}
case _ =>
Some(JsonFormat(ApiContents(f, content)))
}