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

Merge branch 'master' into toggle_gravatar

Browse Source 
Conflicts:
	src/main/scala/view/AvatarImageProvider.scala
This commit is contained in:
takezoe
2013-08-06 01:58:47 +09:00
parent b61836adf7 cfb2f5beb9
commit b31b7e1e86
59 changed files with 2956 additions and 748 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/scala/view/AvatarImageProvider.scala
View File

@@ -13,18 +13,18 @@ trait AvatarImageProvider { self: RequestCache =>
protected def getAvatarImageHtml(userName: String, size: Int,
mailAddress: String = "", tooltip: Boolean = false)(implicit context: app.Context): Html = {
val src = if(getSystemSettings().gravatar){
getAccountByUserName(userName).collect { case account if(account.image.isEmpty && !account.isGroupAccount) =>
val src = getAccountByUserName(userName).map { account =>
if(account.image.isEmpty && getSystemSettings().gravatar){
s"""http://www.gravatar.com/avatar/${StringUtil.md5(account.mailAddress)}?s=${size}"""
} getOrElse {
if(mailAddress.nonEmpty){
s"""http://www.gravatar.com/avatar/${StringUtil.md5(mailAddress)}?s=${size}"""
} else {
s"""${context.path}/${userName}/_avatar"""
}
} else {
s"""${context.path}/${userName}/_avatar"""
}
} getOrElse {
if(mailAddress.nonEmpty && getSystemSettings().gravatar){
s"""http://www.gravatar.com/avatar/${StringUtil.md5(mailAddress)}?s=${size}"""
} else {
s"""${context.path}/${userName}/_avatar"""
}
} else {
s"""${context.path}/${userName}/_avatar"""
}
if(tooltip){