From da3c13f11b8dc5b16daf942a85cd3ae34dfb4697 Mon Sep 17 00:00:00 2001
From: Ahmet Akbana <ahmetakbana@gmail.com>
Date: Mon, 9 May 2016 19:41:01 +0200
Subject: [PATCH] datagrid category value must be object, it was being set to
 integer

---
 Controller/MediaAdminController.php       | 9 ++++-----
 Resources/views/MediaAdmin/list.html.twig | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Controller/MediaAdminController.php b/Controller/MediaAdminController.php
index 0efdf42ba..b954392fe 100644
--- a/Controller/MediaAdminController.php
+++ b/Controller/MediaAdminController.php
@@ -80,19 +80,18 @@ public function listAction(Request $request = null)
         $category = $this->container->get('sonata.classification.manager.category')->getRootCategory($context);
 
         if (!$filters) {
-            $datagrid->setValue('category', null, $category->getId());
+            $datagrid->setValue('category', null, $category);
         }
-
         if ($request->get('category')) {
-            $contextInCategory = $this->container->get('sonata.classification.manager.category')->findBy(array(
+            $contextInCategory = $this->container->get('sonata.classification.manager.category')->findOneBy(array(
                 'id'      => (int) $request->get('category'),
                 'context' => $context,
             ));
 
             if (!empty($contextInCategory)) {
-                $datagrid->setValue('category', null, $request->get('category'));
+                $datagrid->setValue('category', null, $contextInCategory);
             } else {
-                $datagrid->setValue('category', null, $category->getId());
+                $datagrid->setValue('category', null, $category);
             }
         }
 
diff --git a/Resources/views/MediaAdmin/list.html.twig b/Resources/views/MediaAdmin/list.html.twig
index a4661cc37..cc7d59436 100644
--- a/Resources/views/MediaAdmin/list.html.twig
+++ b/Resources/views/MediaAdmin/list.html.twig
@@ -21,7 +21,7 @@ file that was distributed with this source code.
     <ul{% if root %} class="sonata-tree sonata-tree--small js-treeview sonata-tree--toggleable"{% endif %}>
         {% for element in collection %}
             <li>
-                <div class="sonata-tree__item{% if element.id == current_category %} is-active{% endif %}"{% if depth < 2 %} data-treeview-toggled{% endif %}>
+                <div class="sonata-tree__item{% if element.id == current_category.id %} is-active{% endif %}"{% if depth < 2 %} data-treeview-toggled{% endif %}>
                     {% if element.parent or root %}<i class="fa fa-caret-right" data-treeview-toggler></i>{% endif %}
                     <a class="sonata-tree__item__edit" href="{{ url(app.request.attributes.get('_route'), app.request.query.all|merge({category: element.id})) }}">{{ element.name }}</a>
                 </div>