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

Merge pull request #1517 from kounoike/pr-fix-1516

Browse Source 
Fix #1516 send noimage.png if user is removed.
This commit is contained in:
Naoki Takezoe
2017-04-02 16:34:42 +09:00
committed by GitHub
parent 0a08879d8c 83a27809ef
commit b99c1c3f6e
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/scala/gitbucket/core/controller/AccountController.scala
View File

@@ -150,20 +150,21 @@ trait AccountControllerBase extends AccountManagementControllerBase {
get("/:userName/_avatar"){
val userName = params("userName")
getAccountByUserName(userName).map{ account =>
contentType = "image/png"
getAccountByUserName(userName).flatMap{ account =>
response.setDateHeader("Last-Modified", account.updatedDate.getTime)
account.image.map{ image =>
RawData(FileUtil.getMimeType(image), new java.io.File(getUserUploadDir(userName), image))
Some(RawData(FileUtil.getMimeType(image), new java.io.File(getUserUploadDir(userName), image)))
}.getOrElse{
contentType = "image/png"
(if (account.isGroupAccount) {
if (account.isGroupAccount) {
TextAvatarUtil.textGroupAvatar(account.fullName)
} else {
TextAvatarUtil.textAvatar(account.fullName)
}).getOrElse(Thread.currentThread.getContextClassLoader.getResourceAsStream("noimage.png"))
}
}
}.getOrElse{
NotFound()
response.setHeader("Cache-Control", "max-age=3600")
Thread.currentThread.getContextClassLoader.getResourceAsStream("noimage.png")
}
}