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

(Fixes #2400) Fix edit group button's display condition (#2401)

Browse Source
This commit is contained in:
Naoki Takezoe
2019-11-16 21:00:22 +09:00
committed by GitHub
parent f35ecce3c7
commit 94f9d42fc4
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -255,12 +255,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
account,
members,
extraMailAddresses,
context.loginAccount.exists(
x =>
members.exists { member =>
member.userName == x.userName && member.isManager
}
)
isGroupManager(context.loginAccount, members)
)
}
@@ -272,12 +267,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
if (account.isGroupAccount) Nil else getGroupsByUserName(userName),
getVisibleRepositories(context.loginAccount, Some(userName)),
extraMailAddresses,
context.loginAccount.exists(
x =>
members.exists { member =>
member.userName == x.userName && member.isManager
}
)
isGroupManager(context.loginAccount, members)
)
}
}
@@ -822,4 +812,13 @@ trait AccountControllerBase extends AccountManagementControllerBase {
}
}
}
private def isGroupManager(account: Option[Account], members: Seq[GroupMember]): Boolean = {
account.exists { account =>
account.isAdmin || members.exists { member =>
member.userName == account.userName && member.isManager
}
}
}
}