From 9cc5d0ea17b36d5885277079ba73e832be89f28e Mon Sep 17 00:00:00 2001 From: KOUNOIKE Yuusuke Date: Sat, 27 Jan 2018 12:32:28 +0900 Subject: [PATCH] fix #1861 --- .../scala/gitbucket/core/service/IssuesService.scala | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/scala/gitbucket/core/service/IssuesService.scala b/src/main/scala/gitbucket/core/service/IssuesService.scala index 5d72a332b..2283c1725 100644 --- a/src/main/scala/gitbucket/core/service/IssuesService.scala +++ b/src/main/scala/gitbucket/core/service/IssuesService.scala @@ -471,7 +471,14 @@ trait IssuesService { def getAssignableUserNames(owner: String, repository: String)(implicit s: Session): List[String] = { (getCollaboratorUserNames(owner, repository, Seq(Role.ADMIN, Role.DEVELOPER)) ::: - (if (getAccountByUserName(owner).get.isGroupAccount) getGroupMembers(owner).map(_.userName) else List(owner))).distinct.sorted + (getAccountByUserName(owner) match { + case Some(x) if x.isGroupAccount => + getGroupMembers(owner).map(_.userName) + case Some(_) => + List(owner) + case None => + Nil + })).distinct.sorted } }