diff --git a/src/main/scala/gitbucket/core/controller/AccountController.scala b/src/main/scala/gitbucket/core/controller/AccountController.scala index 7d3d1eb..fa46b78 100644 --- a/src/main/scala/gitbucket/core/controller/AccountController.scala +++ b/src/main/scala/gitbucket/core/controller/AccountController.scala @@ -121,7 +121,7 @@ // Members case "members" if(account.isGroupAccount) => { val members = getGroupMembers(account.userName) - gitbucket.core.account.html.members(account, members.map(_.userName), + gitbucket.core.account.html.members(account, members, context.loginAccount.exists(x => members.exists { member => member.userName == x.userName && member.isManager })) } diff --git a/src/main/twirl/gitbucket/core/account/members.scala.html b/src/main/twirl/gitbucket/core/account/members.scala.html index 816f6fb..996dc1d 100644 --- a/src/main/twirl/gitbucket/core/account/members.scala.html +++ b/src/main/twirl/gitbucket/core/account/members.scala.html @@ -1,13 +1,14 @@ -@(account: gitbucket.core.model.Account, members: List[String], isGroupManager: Boolean)(implicit context: gitbucket.core.controller.Context) +@(account: gitbucket.core.model.Account, members: List[gitbucket.core.model.GroupMember], isGroupManager: Boolean)(implicit context: gitbucket.core.controller.Context) @import gitbucket.core.view.helpers @gitbucket.core.account.html.main(account, Nil, "members", isGroupManager){ @if(members.isEmpty){ No members } else { - @members.map { userName => + @members.map { member =>