Merge 3401112 into 6947ed3

ekreative · Jun 14, 2017 · 266c1c1 · 266c1c1
2 parents 6947ed3 + 3401112
commit 266c1c1
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 4 deletions.
diff --git a/src/AppBundle/Controller/SiteController.php b/src/AppBundle/Controller/SiteController.php
@@ -43,13 +43,30 @@ public function indexAction(Request $request)
             $status = $request->query->get('status');
         }
 
+        // get all projects current user from RedMine
+        $redMineClientService = $this->container->get('redmine_client');
+        $uri = '/users/' . $this->getUser()->getId() . '.json?include=memberships';
+        $listMemberships = $redMineClientService->get($uri)['user']['memberships'];
+
+        if (in_array('ROLE_REDMINE_ADMIN', $this->getUser()->getRoles())) {
+            $arrayIdProjects = [];
+        } else {
+            if ($listMemberships) {
+                $arrayIdProjects = [];
+                foreach ($listMemberships as $membership) {
+                    $arrayIdProjects[] = $membership['project']['id'];
+                }
+            }
+        }
+
         if ($name || $framework || $status) {
-            $query = $em->getRepository('AppBundle:Site')->searchQuery($name, $framework, $status);
+            $query = $em->getRepository('AppBundle:Site')->searchQuery($name, $framework, $status, $arrayIdProjects);
         } else {
             $query = $em->getRepository('AppBundle:Site')->findBy(['status' => $status]);
         }
 
-        $entities = $this->get('knp_paginator')->paginate($query, $request->query->getInt('page', 1), 12);
+
+        $entities = $this->get('knp_paginator')->paginate($query, $request->query->getInt('page', 1), 100);
         $form = $this->createSearchForm(['name' => $name, 'framework' => $framework, 'status' => $status]);
 
         return [

diff --git a/src/AppBundle/Entity/SiteRepository.php b/src/AppBundle/Entity/SiteRepository.php
@@ -13,7 +13,7 @@ class SiteRepository extends EntityRepository
      * @param string $status
      * @return Query
      */
-    public function searchQuery($name = null, $framework = null, $status = null)
+    public function searchQuery($name = null, $framework = null, $status = null, $projects = [])
     {
         $qb = $this->createQueryBuilder('s');
         if ($name) {
@@ -27,6 +27,11 @@ public function searchQuery($name = null, $framework = null, $status = null)
                 ->setParameter('framework', $framework);
         }
 
+        if (count($projects) != 0) {
+            $qb->andWhere('s.project IN (:projects)')
+                ->setParameter('projects', $projects);
+        }
+
         if ($status == Site::STATUS_SUPPORTED) {
             $qb
                 ->andWhere('s.status = :status')

diff --git a/src/AppBundle/Form/SiteType.php b/src/AppBundle/Form/SiteType.php
@@ -45,7 +45,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'label' => 'Status',
                 'required' => false,
                 'choices' => [
-                    'Suppoerted' => Site::STATUS_SUPPORTED,
+                    'Supported' => Site::STATUS_SUPPORTED,
                     'UnSupported' => Site::STATUS_UNSUPPORTED,
                 ],
                 'empty_value' => null,