Merge pull request #84 from SURFnet/fix-group-rendering

Fix group rendering

Author: lucasvanlierop

app/Resources/views/groups/search-results.html.twig

@@ -1,3 +1,3 @@
 <div class="jscroll-inner">
-{% include ':groups:_groups.html.twig' with {'color': 'grey', 'type': 'results'} %}
+{% include ':groups:_groups.html.twig' with {'color': 'grey', 'type': 'results', 'groups': organisationGroups} %}
 </div>

src/AppBundle/Controller/IndexController.php

@@ -68,9 +68,19 @@ public function groupsAction(Request $request)
             throw new BadRequestHttpException();
         }
 
+        $groups = $this->getGroups($request->cookies, $query, $sort, $offset, $limit, $type);
+
+        $pluckCollection = function ($value) {
+            if (isset($value['collection'])) {
+                return $value['collection'];
+            }
+
+            return $value;
+        };
+
         return $this->render(
             $this->getTemplate($type),
-            $this->getGroups($request->cookies, $query, $sort, $offset, $limit, $type)
+            is_null($type) ? $groups: array_map($pluckCollection, $groups)
         );
     }