From 4088b2c1e8fc43a527a64f46c37b5eaeb5b8926b Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Sun, 30 Aug 2015 03:33:14 +0900 Subject: [PATCH] Exclude group name from issue / pull request assignees --- .../scala/gitbucket/core/controller/IssuesController.scala | 6 +++++- .../gitbucket/core/controller/PullRequestsController.scala | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/scala/gitbucket/core/controller/IssuesController.scala b/src/main/scala/gitbucket/core/controller/IssuesController.scala index c780ae419..8f2bfafb1 100644 --- a/src/main/scala/gitbucket/core/controller/IssuesController.scala +++ b/src/main/scala/gitbucket/core/controller/IssuesController.scala @@ -465,7 +465,11 @@ trait IssuesControllerBase extends ControllerBase { "issues", searchIssue(condition, false, (page - 1) * IssueLimit, IssueLimit, owner -> repoName), page, - (getCollaborators(owner, repoName) :+ owner).sorted, + if(!getAccountByUserName(owner).exists(_.isGroupAccount)){ + (getCollaborators(owner, repoName) :+ owner).sorted + } else { + getCollaborators(owner, repoName) + }, getMilestones(owner, repoName), getLabels(owner, repoName), countIssue(condition.copy(state = "open" ), false, owner -> repoName), diff --git a/src/main/scala/gitbucket/core/controller/PullRequestsController.scala b/src/main/scala/gitbucket/core/controller/PullRequestsController.scala index c6b49ca2a..2471f7eda 100644 --- a/src/main/scala/gitbucket/core/controller/PullRequestsController.scala +++ b/src/main/scala/gitbucket/core/controller/PullRequestsController.scala @@ -493,7 +493,11 @@ trait PullRequestsControllerBase extends ControllerBase { "pulls", searchIssue(condition, true, (page - 1) * PullRequestLimit, PullRequestLimit, owner -> repoName), page, - (getCollaborators(owner, repoName) :+ owner).sorted, + if(!getAccountByUserName(owner).exists(_.isGroupAccount)){ + (getCollaborators(owner, repoName) :+ owner).sorted + } else { + getCollaborators(owner, repoName) + }, getMilestones(owner, repoName), getLabels(owner, repoName), countIssue(condition.copy(state = "open" ), true, owner -> repoName),