3 files changed, 19 insertions, 2 deletions

diff --git a/src/Wallabag/UserBundle/Entity/User.php b/src/Wallabag/UserBundle/Entity/User.php
index 4f24b17a..4a52b186 100644
--- a/src/Wallabag/UserBundle/Entity/User.php
+++ b/src/Wallabag/UserBundle/Entity/User.php
@@ -393,4 +393,13 @@ class User extends BaseUser implements TwoFactorInterface, TrustedComputerInterf
 
         return $groups;
     }
+
+        /**
+         * @param Group $group
+         * @param $role
+         */
+        public function addAGroup(Group $group, $role)
+        {
+                $this->userGroups->add(new UserGroup($this, $group, $role));
+        }
 }
diff --git a/src/Wallabag/UserBundle/Repository/UserRepository.php b/src/Wallabag/UserBundle/Repository/UserRepository.php
index 6adbe329..b4b13605 100644
--- a/src/Wallabag/UserBundle/Repository/UserRepository.php
+++ b/src/Wallabag/UserBundle/Repository/UserRepository.php
@@ -58,11 +58,19 @@ class UserRepository extends EntityRepository
      *
      * @param string $term
      *
-     * @return QueryBuilder
+     * @return \Doctrine\ORM\QueryBuilder
      */
     public function getQueryBuilderForSearch($term)
     {
         return $this->createQueryBuilder('u')
             ->andWhere('lower(u.username) LIKE lower(:term) OR lower(u.email) LIKE lower(:term) OR lower(u.name) LIKE lower(:term)')->setParameter('term', '%'.$term.'%');
     }
+
+    public function findGroupMembers($groupid)
+    {
+        return $this->createQueryBuilder('u')
+            ->leftJoin('u.userGroups', 'usergroup')
+            ->where('usergroup.group = :group')->setParameter(':group', $groupid)
+            ->andWhere('usergroup.accepted = true');
+    }
 }
diff --git a/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig b/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig
index 5fc6163e..9d5abcaf 100644
--- a/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig
@@ -30,7 +30,7 @@
                                 {{ form_rest(searchForm) }}
                             </form>
                         </div>
-                        
+
                     </div>
 
                     <table class="bordered">