Merge pull request #65 from gregorybesson/develop

Fix user list

Author: gregorybesson

config/module.config.php

@@ -444,11 +444,11 @@
                             'list' => array(
                                 'type' => 'Segment',
                                 'options' => array(
-                                    'route' => '/list/:roleId[/:filter][/:p]',
+                                    'route' => '/list[/:roleId][/:filter][/:p]',
                                     'defaults' => array(
                                         'controller' => 'playgrounduseradmin',
                                         'action'     => 'list',
-                                        'roleId' 	 => 'user',
+                                        //'roleId' 	 => 'user',
                                         'filter' 	 => 'DESC'
                                     ),
                                     'constraints' => array(

src/PlaygroundUser/Controller/Admin/AdminController.php

@@ -24,7 +24,7 @@ public function listAction()
         $adapter = new DoctrineAdapter(new ORMPaginator($this->getAdminUserService()->getQueryUsersByRole($role, null, $search)));
 
         $paginator = new Paginator($adapter);
-        $paginator->setItemCountPerPage(100);
+        $paginator->setItemCountPerPage(50);
         $paginator->setCurrentPageNumber($this->getEvent()->getRouteMatch()->getParam('p'));
 
 

src/PlaygroundUser/Service/User.php

@@ -733,27 +733,31 @@ public function createRole(array $data)
         return $role;
     }
 
-    public function getQueryUsersByRole($role=1, $order=null, $search='')
+    public function getQueryUsersByRole($role=null, $order=null, $search='')
     {
         $em = $this->getServiceManager()->get('doctrine.entitymanager.orm_default');
         $filterSearch = '';
+        $roleSearch = '1=1 ';
 
         if ($search != '') {
             $filterSearch = " AND (u.username like '%" . $search . "%' OR u.lastname like '%" . $search . "%' OR u.firstname like '%" . $search . "%' OR u.email like '%" . $search . "%')";
         }
 
+        if ($role) {
+            $roleSearch = "r.id = " . $role->getId();
+        }
+
         // I Have to know what is the User Class used
         $zfcUserOptions = $this->getServiceManager()->get('zfcuser_module_options');
         $userClass = $zfcUserOptions->getUserEntityClass();
 
         $query = $em->createQuery('
             SELECT u FROM ' . $userClass . ' u
-            JOIN u.roles r
-            WHERE r.id = :role' .
+            LEFT JOIN u.roles r
+            WHERE ' . $roleSearch .
                 $filterSearch .
                 (in_array($order,array('ASC','DESC'))?' ORDER BY u.created_at '.$order:'').'
         ');
-        $query->setParameter('role', $role);
         return $query;
     }