From c400678550f134511ed6a86c6a8c7e8a4fce3b40 Mon Sep 17 00:00:00 2001
From: Naoki Takezoe <takezoe@gmail.com>
Date: Mon, 2 May 2016 15:47:59 +0900
Subject: [PATCH] (refs #1178)Check group member isn't group account

---
 .../scala/gitbucket/core/controller/IndexController.scala     | 4 +++-
 src/main/twirl/gitbucket/core/admin/usergroup.scala.html      | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/scala/gitbucket/core/controller/IndexController.scala b/src/main/scala/gitbucket/core/controller/IndexController.scala
index ba3cfd8dc..6bc27515a 100644
--- a/src/main/scala/gitbucket/core/controller/IndexController.scala
+++ b/src/main/scala/gitbucket/core/controller/IndexController.scala
@@ -117,7 +117,9 @@ trait IndexControllerBase extends ControllerBase {
    * JSON API for checking user existence.
    */
   post("/_user/existence")(usersOnly {
-    getAccountByUserName(params("userName")).isDefined
+    getAccountByUserName(params("userName")).map { account =>
+      if(params.get("userOnly").isDefined) !account.isGroupAccount else true
+    } getOrElse false
   })
 
   // TODO Move to RepositoryViwerController?
diff --git a/src/main/twirl/gitbucket/core/admin/usergroup.scala.html b/src/main/twirl/gitbucket/core/admin/usergroup.scala.html
index b9f61713a..ac8044d55 100644
--- a/src/main/twirl/gitbucket/core/admin/usergroup.scala.html
+++ b/src/main/twirl/gitbucket/core/admin/usergroup.scala.html
@@ -78,7 +78,8 @@ $(function(){
 
     // check existence
     $.post('@path/_user/existence', {
-      'userName': userName
+      'userName': userName,
+      'userOnly': true
     }, function(data, status){
       if(data == 'true'){
         addMemberHTML(userName, false);