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

Change trigger of "Disalbe mail resolve is enalbed" from "When system settings check-box is ON" to "When mail attribute is empty".

Browse Source
This commit is contained in:
yjkony
2014-03-11 12:56:00 +09:00
parent 8d200c72d3
commit 4e2a3fdbd0
5 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/service/AccountService.scala
View File

@@ -40,7 +40,7 @@ trait AccountService {
// Create or update account by LDAP information
getAccountByUserName(userName, true) match {
case Some(x) if(!x.isRemoved) => {
if(settings.ldap.get.disableMailResolve.getOrElse(false)) {
if(settings.ldap.get.mailAttribute.getOrElse("").isEmpty) {
updateAccount(x.copy(fullName = ldapUserInfo.fullName))
} else {
updateAccount(x.copy(mailAddress = ldapUserInfo.mailAddress, fullName = ldapUserInfo.fullName))