Merge remote-tracking branch 'upstream/master' into editable-persistent-params

Admin/Pool.php

@@ -84,11 +84,16 @@ class Pool
 
         foreach ($this->adminGroups as $name => $adminGroup) {
             if (isset($adminGroup['items'])) {
-                foreach ($adminGroup['items'] as $key => $id) {
-                    $admin = $this->getInstance($id);
-
-                    if ($admin->showIn(Admin::CONTEXT_DASHBOARD)) {
-                        $groups[$name]['items'][$key] = $admin;
+                foreach ($adminGroup['items'] as $key => $item) {
+                    // Only Admin Group should be returned
+                    if ('' != $item['admin']) {
+                        $admin = $this->getInstance($item['admin']);
+
+                        if ($admin->showIn(Admin::CONTEXT_DASHBOARD)) {
+                            $groups[$name]['items'][$key] = $admin;
+                        } else {
+                            unset($groups[$name]['items'][$key]);
+                        }
                     } else {
                         unset($groups[$name]['items'][$key]);
                     }

CHANGELOG.md

@@ -1,6 +1,9 @@
 CHANGELOG
 =========
 
+## 2015-02-18
+ * [BC BREAK] Integration of KNPMenu for the admin menu. This integration is resetted when the standard layout ``standard_layout.html.twig`` is overrided. The KNPMenu is available in ``sonata_menu.html.twig`` template.
+
 ### 2015-02-15
  * [BC BREAK] added ``getFieldOption``, ``setFieldOption`` methods to the FilterInterface
  * [BC BREAK] added the ``getFilterFieldDescription`` method to the AdminInterface

DependencyInjection/Compiler/AddDependencyCallsCompilerPass.php

@@ -336,6 +336,7 @@ class AddDependencyCallsCompilerPass implements CompilerPassInterface
             'pager_links'                => 'SonataAdminBundle:Pager:links.html.twig',
             'pager_results'              => 'SonataAdminBundle:Pager:results.html.twig',
             'tab_menu_template'          => 'SonataAdminBundle:Core:tab_menu_template.html.twig',
+            'knp_menu_template'          => 'SonataAdminBundle:Menu:sonata_menu.html.twig',
             'outer_list_rows_mosaic'     => 'SonataAdminBundle:CRUD:list_outer_rows_mosaic.html.twig',
             'outer_list_rows_list'       => 'SonataAdminBundle:CRUD:list_outer_rows_list.html.twig',
             'outer_list_rows_tree'       => 'SonataAdminBundle:CRUD:list_outer_rows_tree.html.twig',

DependencyInjection/Configuration.php

@@ -103,7 +103,43 @@ class Configuration implements ConfigurationInterface
                                     ->scalarNode('label_catalogue')->end()
                                     ->scalarNode('icon')->defaultValue('<i class="fa fa-folder"></i>')->end()
                                     ->arrayNode('items')
-                                        ->prototype('scalar')->end()
+                                        ->beforeNormalization()
+                                            ->ifArray()
+                                            ->then(function($items) {
+                                                foreach ($items as $key => $item) {
+                                                    if (is_array($item)) {
+                                                        if (!array_key_exists('label', $item) || !array_key_exists('route', $item)) {
+                                                            throw new \InvalidArgumentException('Expected either parameters "route" and "label" for array items');
+                                                        }
+
+                                                        if (!array_key_exists('route_params', $item)){
+                                                            $items[$key]['route_params'] = array();
+                                                        }
+
+                                                        $items[$key]['admin'] = '';
+                                                    } else {
+                                                        $items[$key] = array(
+                                                            'admin'        => $item,
+                                                            'label'        => '',
+                                                            'route'        => '',
+                                                            'route_params' => array()
+                                                        );
+                                                    }
+                                                }
+
+                                                return $items;
+                                            })
+                                        ->end()
+                                        ->prototype('array')
+                                            ->children()
+                                                ->scalarNode('admin')->end()
+                                                ->scalarNode('label')->end()
+                                                ->scalarNode('route')->end()
+                                                ->arrayNode('route_params')
+                                                    ->prototype('scalar')->end()
+                                                ->end()
+                                            ->end()
+                                        ->end()
                                     ->end()
                                     ->arrayNode('item_adds')
                                         ->prototype('scalar')->end()
@@ -211,6 +247,7 @@ class Configuration implements ConfigurationInterface
                         ->scalarNode('pager_links')->defaultValue('SonataAdminBundle:Pager:links.html.twig')->cannotBeEmpty()->end()
                         ->scalarNode('pager_results')->defaultValue('SonataAdminBundle:Pager:results.html.twig')->cannotBeEmpty()->end()
                         ->scalarNode('tab_menu_template')->defaultValue('SonataAdminBundle:Core:tab_menu_template.html.twig')->cannotBeEmpty()->end()
+                        ->scalarNode('knp_menu_template')->defaultValue('SonataAdminBundle:Menu:sonata_menu.html.twig')->cannotBeEmpty()->end()
                     ->end()
                 ->end()
 

Form/Extension/ChoiceTypeExtension.php

@@ -0,0 +1,53 @@
+<?php
+
+/*
+ * This file is part of the Sonata package.
+ *
+ * (c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Sonata\AdminBundle\Form\Extension;
+
+use Symfony\Component\Form\AbstractTypeExtension;
+use Symfony\Component\Form\FormView;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+
+/**
+ * Class ChoiceTypeExtension
+ *
+ * @package Sonata\AdminBundle\Form\Extension
+ *
+ * @author Amine Zaghdoudi <amine.zaghdoudi@ekino.com>
+ */
+class ChoiceTypeExtension extends AbstractTypeExtension
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    {
+        $resolver->setOptional(array('sortable'));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function buildView(FormView $view, FormInterface $form, array $options)
+    {
+        $view->vars['sortable'] = array_key_exists('sortable', $options) && $options['sortable'];
+    }
+
+    /**
+     * Returns the name of the type being extended.
+     *
+     * @return string The name of the type being extended
+     */
+    public function getExtendedType()
+    {
+        return 'choice';
+    }
+}

Resources/config/form_types.xml

@@ -49,6 +49,10 @@
             <tag name="form.type_extension" alias="form" />
         </service>
 
+        <service id="sonata.admin.form.extension.choice" class="Sonata\AdminBundle\Form\Extension\ChoiceTypeExtension">
+            <tag name="form.type_extension" alias="choice" />
+        </service>
+
         <!-- Form Filter Type -->
         <service id="sonata.admin.form.filter.type.number" class="Sonata\AdminBundle\Form\Type\Filter\NumberType">
             <tag name="form.type" alias="sonata_type_filter_number" />

Resources/config/twig.xml

@@ -9,6 +9,7 @@
             <tag name="twig.extension"/>
 
             <argument type="service" id="sonata.admin.pool" />
+            <argument type="service" id="router" />
             <argument type="service" id="logger" on-invalid="ignore" />
         </service>
     </services>

Resources/doc/index.rst

@@ -25,6 +25,7 @@ Reference Guide
    reference/dashboard
    reference/search
    reference/select2
+   reference/knp_menu
    reference/routing
    reference/action_list
    reference/action_create_edit

Resources/doc/reference/form_types.rst

@@ -511,6 +511,19 @@ General
         <?php
         $form->add('status', null, array('label' => false);
 
+ChoiceType
+^^^^^^^^^^
+
+- ``sortable``: This option can be added for multiple choice widget to activate select2 sortable.
+
+.. code-block:: php
+
+        <?php
+        $form->add('multiChoices', 'choice', array(
+            'multiple' => true,
+            'sortable' => true
+        );
+
 .. _`Symfony field types`: http://symfony.com/doc/current/book/forms.html#built-in-field-types
 .. _`Symfony choice Field Type docs`: http://symfony.com/doc/current/reference/forms/types/choice.html
 .. _`Symfony PropertyPath`: http://api.symfony.com/2.0/Symfony/Component/Form/Util/PropertyPath.html

Resources/doc/reference/knp_menu.rst

@@ -0,0 +1,62 @@
+KnpMenu
+=======
+
+The admin comes with `KnpMenu <https://github.com/KnpLabs/KnpMenu>`_ integration
+It integrates a menu with the KnpMenu library. This menu can be a SonataAdmin service or a route of a custom controller.
+
+Add a custom controller entry in the menu
+-----------------------------------------
+
+To add a custom controller entry in the admin menu:
+
+Create your controller
+
+.. code-block:: php
+
+    /**
+     * @Route("/blog", name="blog_home")
+     */
+    public function blogAction()
+    {
+        // ...
+    }
+
+    /**
+     * @Route("/blog/article/{articleId}", name="blog_article")
+     */
+    public function ArticleAction($articleId)
+    {
+        // ...
+    }
+
+Add the controller route as an item of the menu
+
+.. code-block:: yaml
+
+    # Default configuration for "SonataAdminBundle"
+    sonata_admin:
+        dashboard:
+            groups:
+                news:
+                    label:                ~
+                    label_catalogue:      ~
+                    items:
+                        - sonata.news.admin.post
+                        - route:        blog_home
+                          label:        Blog
+                        - route:        blog_article
+                          route_params: { articleId: 3 }
+                          label:        Article
+                    ...
+
+Also you can override the template of knp_menu used by sonata. The default one is `SonataAdminBundle:Menu:sonata_menu.html.twig`:
+
+.. code-block:: yaml
+
+    # Default configuration for "SonataAdminBundle"
+    sonata_admin:
+        templates:
+            knp_menu_template:           ApplicationAdminBundle:Menu:custom_knp_menu.html.twig
+        ...
+
+And voilà, now you have a new menu group which contains an entry to sonata_admin_id, to your blog and to a specific article.

Resources/doc/reference/preview_mode.rst

@@ -118,7 +118,7 @@ Hiding the fieldset tags with css (display:none) will be enough to only show the
 
 .. code-block:: css
 
-    .sonata-preview-form .row {
+    .sonata-preview-form-container .row {
         display: none;
     };
 
@@ -126,7 +126,7 @@ Or if you prefer less:
 
 .. code-block:: sass
 
-    div.sonata-preview-form {
+    div.sonata-preview-form-container {
       .row {
         display: none;
       };

Resources/public/Admin.js

@@ -444,5 +444,47 @@ var Admin = {
         Admin.log('[core|setup_tree_view] setup tree view', subject);
 
         jQuery('ul.js-treeview', subject).treeView();
+    },
+
+    /**
+     * Setup sortable multiple select2
+     */
+    setup_sortable_select2: function(subject, data) {
+        Admin.log('[core|setup_sortable_select2] configure sortable Select2 on', subject);
+
+        var transformedData = [];
+        for (var i = 0 ; i < data.length ; i++) {
+            transformedData[i] = {id: data[i].data, text: data[i].label};
+        }
+
+        subject.select2({
+            data:     transformedData,
+            multiple: true
+        });
+
+        subject.select2("container").find("ul.select2-choices").sortable({
+            containment: 'parent',
+            start: function () {
+                subject.select2("onSortStart");
+            },
+            update: function () {
+                subject.select2("onSortEnd");
+            }
+        });
+
+        // On form submit, transform value to match what is expected by server
+        subject.parents('form:first').submit(function (event) {
+            var values   = subject.val().split(',');
+            var baseName = subject.attr('name');
+            baseName = baseName.substring(0, baseName.length-1);
+            for (var i=0; i<values.length; i++) {
+                jQuery('<input>')
+                    .attr('type', 'hidden')
+                    .attr('name', baseName+i+']')
+                    .val(values[i])
+                    .appendTo(subject.parents('form:first'));
+            }
+            subject.remove();
+        });
     }
 };

Resources/views/Form/form_admin_fields.html.twig

@@ -131,26 +131,30 @@ file that was distributed with this source code.
     {% if sonata_admin.admin and not sonata_admin.admin.getConfigurationPool().getOption('use_select2') %}
         {% set attr = attr|merge({'class': attr.class|default('') ~ ' form-control'}) %}
     {% endif %}
-    <select {{ block('widget_attributes') }}{% if multiple %} multiple="multiple"{% endif %}>
-        {% if empty_value is not none %}
-            <option value=""{% if required and value is empty %} selected="selected"{% endif %}>
-                {% if not sonata_admin.admin %}
-                    {{- empty_value|trans({}, translation_domain) -}}
-                {% else %}
-                    {{- empty_value|trans({}, sonata_admin.field_description.translationDomain) -}}
-                {% endif%}
-            </option>
-        {% endif %}
-        {% if preferred_choices|length > 0 %}
-            {% set options = preferred_choices %}
-            {{ block('choice_widget_options') }}
-            {% if choices|length > 0 %}
-                <option disabled="disabled">{{ separator }}</option>
+    {% if sortable and multiple %}
+        {{ block('sonata_type_choice_multiple_sortable') }}
+    {% else %}
+        <select {{ block('widget_attributes') }}{% if multiple %} multiple="multiple"{% endif %} >
+            {% if empty_value is not none %}
+                <option value=""{% if required and value is empty %} selected="selected"{% endif %}>
+                    {% if not sonata_admin.admin %}
+                        {{- empty_value|trans({}, translation_domain) -}}
+                    {% else %}
+                        {{- empty_value|trans({}, sonata_admin.field_description.translationDomain) -}}
+                    {% endif%}
+                </option>
             {% endif %}
-        {% endif %}
-        {% set options = choices %}
-        {{ block('choice_widget_options') }}
-    </select>
+            {% if preferred_choices|length > 0 %}
+                {% set options = preferred_choices %}
+                {{ block('choice_widget_options') }}
+                {% if choices|length > 0 %}
+                    <option disabled="disabled">{{ separator }}</option>
+                {% endif %}
+            {% endif %}
+            {% set options = choices %}
+            {{ block('choice_widget_options') }}
+        </select>
+    {% endif %}
 {% endspaceless %}
 {% endblock choice_widget_collapsed %}
 
@@ -316,3 +320,14 @@ file that was distributed with this source code.
 
     </script>
 {% endblock %}
+
+{%  block sonata_type_choice_multiple_sortable %}
+    <input type="hidden" name="{{ full_name }}" id="{{ id }}" value="{{ value|join(',') }}" />
+    <script>
+        jQuery(document).ready(function() {
+            var $target = jQuery('#{{ id }}');
+
+            Admin.setup_sortable_select2($target, {{ form.vars.choices|json_encode|raw }});
+        });
+    </script>
+{% endblock %}

Resources/views/Menu/sonata_menu.html.twig

@@ -0,0 +1,69 @@
+{% extends 'knp_menu.html.twig' %}
+
+{% block root %}
+    {%- set listAttributes = item.childrenAttributes|merge({'class': 'sidebar-menu'}) %}
+    {%- set request        = item.getExtra('request') %}
+    {{ block('list') -}}
+{% endblock %}
+
+{% block item %}
+    {%- if item.displayed %}
+        {#- check role of the group #}
+        {%- set display = (item.getExtra('roles') is empty or is_granted('ROLE_SUPER_ADMIN') ) %}
+        {%- for role in item.getExtra('roles') if not display %}
+            {%- set display = is_granted(role) %}
+        {%- endfor %}
+    {%- endif %}
+
+    {%- if item.displayed and display|default %}
+        {%- set active = false %}
+        {%- if item.getExtra('admin') is not empty and item.getExtra('admin').hasroute('list') and item.getExtra('admin').isGranted('LIST') and request.get('_sonata_admin') == item.getExtra('admin').code %}
+            {%- set active = true %}
+        {%- elseif item.route is defined and request.get('_route') == item.route %}
+            {%- set active = true %}
+        {%- else %}
+            {%- for child in item.children if not active %}
+                {%- if child.getExtra('admin') is not empty and child.getExtra('admin').hasroute('list') and child.getExtra('admin').isGranted('LIST') and request.get('_sonata_admin') == child.getExtra('admin').code %}
+                    {%- set active = true %}
+                {%-  elseif child.route is defined and request.get('_route') == child.route %}
+                    {%- set active = true %}
+                {%- endif %}
+            {%- endfor %}
+        {%- endif %}
+
+        {%- if item.level == 1%}
+            {%- do item.setAttribute('class', (item.attribute('class')~' treeview')|trim) %}
+        {%- endif %}
+        {%- if active %}
+            {%- do item.setAttribute('class', (item.attribute('class')~' active')|trim) %}
+            {%- do item.setChildrenAttribute('class', (item.childrenAttribute('class')~' active')|trim) %}
+        {%- endif %}
+
+        {%- do item.setChildrenAttribute('class', (item.childrenAttribute('class')~' treeview-menu')|trim) %}
+        {{ parent() }}
+    {% endif %}
+{% endblock %}
+
+{% block linkElement %}
+    {% spaceless %}
+        {% set translation_domain = item.getExtra('translationdomain', 'messages') %}
+        {% set icon = item.level > 1 ? '<i class="fa fa-angle-double-right"></i>' : '' %}
+        {% set is_link = true %}
+        {{ parent() }}
+    {% endspaceless %}
+{% endblock %}
+
+{% block spanElement %}
+    {% spaceless %}
+
+        <a href="#">
+            {% set translation_domain = item.attribute('label_catalogue') %}
+            {% set icon = item.attribute('icon')|default ? item.attribute('icon') : '' %}
+            {{ icon|default|raw }}
+            {{ parent() }}
+            <i class="fa pull-right fa-angle-left"></i>
+        </a>
+    {% endspaceless %}
+{% endblock %}
+
+{% block label %}{% if is_link is defined and is_link %}{{ icon|default|raw }}{% endif %}{% if options.allow_safe_labels and item.getExtra('safe_label', false) %}{{ item.label|raw }}{% else %}{{ item.label|trans({}, translation_domain|default('messages')) }}{% endif %}{% endblock %}

Resources/views/standard_layout.html.twig

@@ -210,47 +210,7 @@ file that was distributed with this source code.
                                 {% block side_bar_before_nav %} {% endblock %}
                                 {% block side_bar_nav %}
                                     {% if app.security.token and is_granted('ROLE_SONATA_ADMIN') %}
-                                        <ul class="sidebar-menu">
-                                            {% for group in admin_pool.dashboardgroups %}
-                                                {% set display = (group.roles is empty or is_granted('ROLE_SUPER_ADMIN') ) %}
-                                                {% for role in group.roles if not display %}
-                                                    {% set display = is_granted(role) %}
-                                                {% endfor %}
-
-                                                {# Do not display the group label if no item in group is available #}
-                                                {% set item_count = 0 %}
-                                                {% if display %}
-                                                    {% for admin in group.items if item_count == 0 %}
-                                                        {% if admin.hasroute('list') and admin.isGranted('LIST') %}
-                                                            {% set item_count = item_count+1 %}
-                                                        {% endif %}
-                                                    {% endfor %}
-                                                {% endif %}
-
-                                                {% if display and (item_count > 0) %}
-                                                    {% set active = false %}
-                                                    {% for admin in group.items %}
-                                                        {% if admin.hasroute('list') and admin.isGranted('LIST') and app.request.get('_sonata_admin') == admin.code %}
-                                                            {% set active = true %}
-                                                        {% endif %}
-                                                    {% endfor %}
-                                                    <li class="treeview{% if active %} active{% endif %}">
-                                                        <a href="#">
-                                                            {% if group.icon|default() %}{{ group.icon|raw }}{% endif %}
-                                                            <span>{{ group.label|trans({}, group.label_catalogue) }}</span>
-                                                            <i class="fa pull-right fa-angle-left"></i>
-                                                        </a>
-                                                        <ul class="treeview-menu{% if active %} active{% endif %}">
-                                                            {% for admin in group.items %}
-                                                                {% if admin.hasroute('list') and admin.isGranted('LIST') %}
-                                                                    <li{% if app.request.get('_sonata_admin') == admin.code %} class="active"{% endif %}><a href="{{ admin.generateUrl('list')}}"><i class="fa fa-angle-double-right"></i> {{ admin.label|trans({}, admin.translationdomain) }}</a></li>
-                                                                {% endif %}
-                                                            {% endfor %}
-                                                        </ul>
-                                                    </li>
-                                                {% endif %}
-                                            {% endfor %}
-                                        </ul>
+                                        {{ knp_menu_render(sonata_knp_menu_build(app.request), {'template' : admin_pool.getTemplate('knp_menu_template')}) }}
                                     {% endif %}
                                 {% endblock side_bar_nav %}
                                 {% block side_bar_after_nav %}

Tests/Admin/PoolTest.php

@@ -74,19 +74,20 @@ class PoolTest extends \PHPUnit_Framework_TestCase
 
         $pool->setAdminGroups(array(
             'adminGroup1' => array(
-                'items' => array('itemKey' => 'sonata.user.admin.group1')
+                'items' => array('itemKey' =>  array('admin' => 'sonata.user.admin.group1', 'label' => '', 'route' => '', 'route_params' => array()))
             ),
             'adminGroup2' => array(
-                'items' => array('itemKey' => 'sonata.user.admin.group2')
+                'items' => array('itemKey' =>  array('admin' => 'sonata.user.admin.group2', 'label' => '', 'route' => '', 'route_params' => array()))
             ),
             'adminGroup3' => array(
-                'items' => array('itemKey' => 'sonata.user.admin.group3')
+                'items' => array('itemKey' =>  array('admin' => 'sonata.user.admin.group3', 'label' => '', 'route' => '', 'route_params' => array()))
             ),
         ));
 
         $groups = $pool->getDashboardGroups();
 
         $this->assertCount(1, $groups);
+        $this->assertEquals($admin_group1, $groups['adminGroup1']['items']['itemKey']);
     }
 
     /**

Tests/DependencyInjection/Compiler/AddDependencyCallsCompilerPassTest.php

@@ -77,10 +77,33 @@ class AddDependencyCallsCompilerPassTest extends \PHPUnit_Framework_TestCase
         $this->assertArrayHasKey('items', $dashboardGroupsSettings['sonata_group_one']);
         $this->assertArrayHasKey('item_adds', $dashboardGroupsSettings['sonata_group_one']);
         $this->assertArrayHasKey('roles', $dashboardGroupsSettings['sonata_group_one']);
-
         $this->assertEquals('Group One Label', $dashboardGroupsSettings['sonata_group_one']['label']);
         $this->assertEquals('SonataAdminBundle', $dashboardGroupsSettings['sonata_group_one']['label_catalogue']);
-        $this->assertContains('sonata_post_admin', $dashboardGroupsSettings['sonata_group_one']['items']);
+        $this->assertArrayHasKey('admin', $dashboardGroupsSettings['sonata_group_one']['items'][0]);
+        $this->assertArrayHasKey('route', $dashboardGroupsSettings['sonata_group_one']['items'][0]);
+        $this->assertArrayHasKey('label', $dashboardGroupsSettings['sonata_group_one']['items'][0]);
+        $this->assertArrayHasKey('route_params', $dashboardGroupsSettings['sonata_group_one']['items'][0]);
+        $this->assertContains('sonata_post_admin', $dashboardGroupsSettings['sonata_group_one']['items'][0]);
+        $this->assertArrayHasKey('admin', $dashboardGroupsSettings['sonata_group_one']['items'][1]);
+        $this->assertArrayHasKey('route', $dashboardGroupsSettings['sonata_group_one']['items'][1]);
+        $this->assertArrayHasKey('label', $dashboardGroupsSettings['sonata_group_one']['items'][1]);
+        $this->assertArrayHasKey('route_params', $dashboardGroupsSettings['sonata_group_one']['items'][1]);
+        $this->assertContains('blog_name', $dashboardGroupsSettings['sonata_group_one']['items'][1]);
+        $this->assertContains('Blog', $dashboardGroupsSettings['sonata_group_one']['items'][1]);
+        $this->assertEquals('', $dashboardGroupsSettings['sonata_group_one']['items'][1]['admin']);
+        $this->assertEquals('blog_name', $dashboardGroupsSettings['sonata_group_one']['items'][1]['route']);
+        $this->assertEquals('Blog', $dashboardGroupsSettings['sonata_group_one']['items'][1]['label']);
+        $this->assertEquals(array(), $dashboardGroupsSettings['sonata_group_one']['items'][1]['route_params']);
+        $this->assertArrayHasKey('admin', $dashboardGroupsSettings['sonata_group_one']['items'][2]);
+        $this->assertArrayHasKey('route', $dashboardGroupsSettings['sonata_group_one']['items'][2]);
+        $this->assertArrayHasKey('label', $dashboardGroupsSettings['sonata_group_one']['items'][2]);
+        $this->assertArrayHasKey('route_params', $dashboardGroupsSettings['sonata_group_one']['items'][2]);
+        $this->assertContains('blog_article', $dashboardGroupsSettings['sonata_group_one']['items'][2]);
+        $this->assertContains('Article', $dashboardGroupsSettings['sonata_group_one']['items'][2]);
+        $this->assertEquals('', $dashboardGroupsSettings['sonata_group_one']['items'][2]['admin']);
+        $this->assertEquals('blog_article', $dashboardGroupsSettings['sonata_group_one']['items'][2]['route']);
+        $this->assertEquals('Article', $dashboardGroupsSettings['sonata_group_one']['items'][2]['label']);
+        $this->assertEquals(array('articleId' => 3) , $dashboardGroupsSettings['sonata_group_one']['items'][2]['route_params']);
         $this->assertContains('sonata_news_admin', $dashboardGroupsSettings['sonata_group_one']['item_adds']);
         $this->assertContains('ROLE_ONE', $dashboardGroupsSettings['sonata_group_one']['roles']);
     }
@@ -119,7 +142,7 @@ class AddDependencyCallsCompilerPassTest extends \PHPUnit_Framework_TestCase
         $this->assertArrayHasKey('roles', $adminGroups['sonata_group_one']);
         $this->assertEquals('Group One Label', $adminGroups['sonata_group_one']['label']);
         $this->assertEquals('SonataAdminBundle', $adminGroups['sonata_group_one']['label_catalogue']);
-        $this->assertContains('sonata_post_admin', $adminGroups['sonata_group_one']['items']);
+        $this->assertContains('sonata_post_admin', $adminGroups['sonata_group_one']['items'][0]['admin']);
         $this->assertContains('sonata_news_admin', $adminGroups['sonata_group_one']['items']);
         $this->assertContains('sonata_news_admin', $adminGroups['sonata_group_one']['item_adds']);
         $this->assertFalse(in_array('sonata_article_admin', $adminGroups['sonata_group_one']['items']));
@@ -247,7 +270,16 @@ class AddDependencyCallsCompilerPassTest extends \PHPUnit_Framework_TestCase
                         'label' => 'Group One Label',
                         'label_catalogue' => 'SonataAdminBundle',
                         'items' => array(
-                            'sonata_post_admin'
+                            'sonata_post_admin',
+                            array(
+                                'route' => 'blog_name',
+                                'label' => 'Blog'
+                            ),
+                            array(
+                                'route'        => 'blog_article',
+                                'label'        => 'Article',
+                                'route_params' => array('articleId' => 3)
+                            ),
                         ),
                         'item_adds' => array(
                             'sonata_news_admin'

Tests/DependencyInjection/ConfigurationTest.php

@@ -49,8 +49,8 @@ class ConfigurationTest extends \PHPUnit_Framework_TestCase
             'admin_services' => array(
                 'my_admin_id' => array(
                     'templates' => array(
-                        'form' => array('form.twig.html', 'form_extra.twig.html'),
-                        'view' => array('user_block' => 'SonataAdminBundle:mycustomtemplate.html.twig'),
+                        'form'   => array('form.twig.html', 'form_extra.twig.html'),
+                        'view'   => array('user_block' => 'SonataAdminBundle:mycustomtemplate.html.twig'),
                         'filter' => array()
                     )
                 )
@@ -115,4 +115,94 @@ class ConfigurationTest extends \PHPUnit_Framework_TestCase
 
         $this->assertEquals($config['dashboard']["blocks"][0]["roles"], array("ROLE_ADMIN"));
     }
+
+    public function testDashboardGroups()
+    {
+        $processor = new Processor();
+        $config = $processor->processConfiguration(new Configuration(), array(array(
+            "dashboard" => array(
+                "groups" => array(
+                    "bar" => array(
+                        "label" => "foo",
+                        "icon"  => '<i class="fa fa-edit"></i>',
+                        "items" => array(
+                            "item1",
+                            "item2",
+                            array(
+                                "label" => "fooLabel",
+                                "route" => "fooRoute",
+                                "route_params" => array("bar" => "foo")
+                            ),
+                            array(
+                                "label" => "barLabel",
+                                "route" => "barRoute",
+                            )
+                        )
+                    )
+                )
+            )
+        )));
+
+        $this->assertCount(4, $config['dashboard']["groups"]["bar"]["items"]);
+        $this->assertEquals(
+            $config['dashboard']["groups"]["bar"]["items"][0],
+            array(
+                "admin"        => "item1",
+                "route"        => "",
+                "route_params" => array(),
+                "label"        => "",
+            )
+        );
+        $this->assertEquals(
+            $config['dashboard']["groups"]["bar"]["items"][1],
+            array(
+                "admin"        => "item2",
+                "route"        => "",
+                "route_params" => array(),
+                "label"        => "",
+            )
+        );
+        $this->assertEquals(
+            $config['dashboard']["groups"]["bar"]["items"][2],
+            array(
+                "admin"        => "",
+                "route"        => "fooRoute",
+                "route_params" => array("bar" => "foo"),
+                "label"        => "fooLabel",
+            )
+        );
+        $this->assertEquals(
+            $config['dashboard']["groups"]["bar"]["items"][3],
+            array(
+                "admin"        => "",
+                "route"        => "barRoute",
+                "route_params" => array(),
+                "label"        => "barLabel",
+            )
+        );
+    }
+
+    public function testDashboardGroupsWithBadItemsParams()
+    {
+        $this->setExpectedException('\InvalidArgumentException', 'Expected either parameters "route" and "label" for array items');
+
+        $processor = new Processor();
+        $config = $processor->processConfiguration(new Configuration(), array(array(
+            "dashboard" => array(
+                "groups" => array(
+                    "bar" => array(
+                        "label" => "foo",
+                        "icon" => '<i class="fa fa-edit"></i>',
+                        "items" => array(
+                            "item1",
+                            "item2",
+                            array(
+                                "route" => "fooRoute"
+                            )
+                        )
+                    )
+                )
+            )
+        )));
+    }
 }

Tests/Form/Extension/ChoiceTypeExtensionTest.php

@@ -0,0 +1,54 @@
+<?php
+
+/*
+ * This file is part of the Sonata package.
+ *
+ * (c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Sonata\AdminBundle\Tests\Form\Extension;
+
+use Sonata\AdminBundle\Form\Extension\ChoiceTypeExtension;
+use Symfony\Component\Form\Forms;
+
+class ChoiceTypeExtensionTest extends \PHPUnit_Framework_TestCase
+{
+    protected function setup()
+    {
+        $this->factory = Forms::createFormFactoryBuilder()
+            ->addTypeExtension(new ChoiceTypeExtension())
+            ->getFormFactory();
+    }
+
+    public function testExtendedType()
+    {
+        $extension = new ChoiceTypeExtension();
+
+        $this->assertEquals('choice', $extension->getExtendedType());
+    }
+
+    public function testDefaultOptionsWithSortable()
+    {
+        $view = $this->factory
+            ->create('choice', null, array(
+                'sortable' => true,
+            ))
+            ->createView();
+
+        $this->assertTrue(isset($view->vars['sortable']));
+        $this->assertTrue($view->vars['sortable']);
+    }
+
+    public function testDefaultOptionsWithoutSortable()
+    {
+        $view = $this->factory
+            ->create('choice', null, array())
+            ->createView();
+
+        $this->assertTrue(isset($view->vars['sortable']));
+        $this->assertFalse($view->vars['sortable']);
+    }
+}

Tests/Twig/Extension/SonataAdminExtensionTest.php

@@ -11,21 +11,22 @@
 
 namespace Sonata\AdminBundle\Tests\Twig\Extension;
 
-use Sonata\AdminBundle\Twig\Extension\SonataAdminExtension;
 use Sonata\AdminBundle\Admin\Pool;
-use Symfony\Bridge\Twig\Tests\Extension\Fixtures\StubFilesystemLoader;
+use Sonata\AdminBundle\Admin\FieldDescriptionInterface;
+use Sonata\AdminBundle\Admin\AdminInterface;
+use Sonata\AdminBundle\Exception\NoValueException;
+use Sonata\AdminBundle\Twig\Extension\SonataAdminExtension;
+use Symfony\Bridge\Twig\Extension\RoutingExtension;
 use Symfony\Bridge\Twig\Extension\TranslationExtension;
-use Symfony\Component\Translation\Translator;
-use Symfony\Component\Translation\MessageSelector;
-use Symfony\Component\Translation\Loader\XliffFileLoader;
+use Symfony\Bridge\Twig\Tests\Extension\Fixtures\StubFilesystemLoader;
+use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Routing\Generator\UrlGenerator;
 use Symfony\Component\Routing\Loader\XmlFileLoader;
-use Symfony\Component\Config\FileLocator;
-use Symfony\Bridge\Twig\Extension\RoutingExtension;
 use Symfony\Component\Routing\RequestContext;
-use Sonata\AdminBundle\Exception\NoValueException;
-use Sonata\AdminBundle\Admin\FieldDescriptionInterface;
-use Sonata\AdminBundle\Admin\AdminInterface;
+use Symfony\Component\Routing\RouterInterface;
+use Symfony\Component\Translation\Translator;
+use Symfony\Component\Translation\MessageSelector;
+use Symfony\Component\Translation\Loader\XliffFileLoader;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -70,6 +71,11 @@ class SonataAdminExtensionTest extends \PHPUnit_Framework_TestCase
      */
     private $pool;
 
+    /**
+     * @var Router
+     */
+    private $router;
+
     /**
      * @var LoggerInterface
      */
@@ -82,9 +88,11 @@ class SonataAdminExtensionTest extends \PHPUnit_Framework_TestCase
         $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
 
         $this->pool = new Pool($container, '', '');
+        $this->router = $this->getMock('Symfony\Component\Routing\RouterInterface');
+
         $this->logger = $this->getMock('Psr\Log\LoggerInterface');
 
-        $this->twigExtension = new SonataAdminExtension($this->pool, $this->logger);
+        $this->twigExtension = new SonataAdminExtension($this->pool, $this->router, $this->logger);
 
         $loader = new StubFilesystemLoader(array(
             __DIR__.'/../../../Resources/views/CRUD',
@@ -861,4 +869,38 @@ class SonataAdminExtensionTest extends \PHPUnit_Framework_TestCase
 
         $this->assertEquals(1234567, $this->twigExtension->getUrlsafeIdentifier($entity, $this->adminBar));
     }
+
+    public function testGetKnpMenu()
+    {
+        $request = $this->getMock('Symfony\Component\HttpFoundation\Request');
+
+        $adminGroups = array(
+            "bar" => array(
+                "label" => "foo",
+                "icon"  => '<i class="fa fa-edit"></i>',
+                "items" => array(
+                    array(
+                        "admin"        => "",
+                        "label"        => "fooLabel",
+                        "route"        => "FooRoute",
+                        "route_params" => array("foo" => "bar"),
+                    )
+                ),
+                "item_adds" => array(),
+                "roles"     => array()
+
+            )
+        );
+        $this->pool->setAdminGroups($adminGroups);
+        $menu = $this->twigExtension->getKnpMenu($request);
+
+        $this->assertInstanceOf('Knp\Menu\ItemInterface', $menu);
+        $this->assertArrayHasKey('bar', $menu->getChildren());
+
+        foreach ($menu->getChildren() as $key => $child) {
+            $this->assertInstanceOf('Knp\Menu\MenuItem', $child);
+            $this->assertEquals("bar", $child->getName());
+            $this->assertEquals($adminGroups["bar"]["label"], $child->getLabel());
+        }
+    }
 }

Twig/Extension/SonataAdminExtension.php

@@ -12,12 +12,16 @@
 namespace Sonata\AdminBundle\Twig\Extension;
 
 use Doctrine\Common\Util\ClassUtils;
+use Knp\Menu\MenuFactory;
+use Knp\Menu\ItemInterface;
+use Psr\Log\LoggerInterface;
 use Sonata\AdminBundle\Admin\AdminInterface;
 use Sonata\AdminBundle\Admin\FieldDescriptionInterface;
-use Sonata\AdminBundle\Exception\NoValueException;
 use Sonata\AdminBundle\Admin\Pool;
+use Sonata\AdminBundle\Exception\NoValueException;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\PropertyAccess\PropertyAccess;
-use Psr\Log\LoggerInterface;
+use Symfony\Component\Routing\RouterInterface;
 
 class SonataAdminExtension extends \Twig_Extension
 {
@@ -31,6 +35,11 @@ class SonataAdminExtension extends \Twig_Extension
      */
     protected $pool;
 
+    /**
+     * @var RouterInterface
+     */
+    protected $router;
+
     /**
      * @var LoggerInterface
      */
@@ -40,10 +49,11 @@ class SonataAdminExtension extends \Twig_Extension
      * @param Pool            $pool
      * @param LoggerInterface $logger
      */
-    public function __construct(Pool $pool, LoggerInterface $logger = null)
+    public function __construct(Pool $pool, RouterInterface $router, LoggerInterface $logger = null)
     {
-        $this->pool = $pool;
+        $this->pool   = $pool;
         $this->logger = $logger;
+        $this->router = $router;
     }
 
     /**
@@ -60,12 +70,23 @@ class SonataAdminExtension extends \Twig_Extension
     public function getFilters()
     {
         return array(
-            'render_list_element'           => new \Twig_Filter_Method($this, 'renderListElement', array('is_safe' => array('html'))),
-            'render_view_element'           => new \Twig_Filter_Method($this, 'renderViewElement', array('is_safe' => array('html'))),
-            'render_view_element_compare'   => new \Twig_Filter_Method($this, 'renderViewElementCompare', array('is_safe' => array('html'))),
-            'render_relation_element'       => new \Twig_Filter_Method($this, 'renderRelationElement'),
-            'sonata_urlsafeid'              => new \Twig_Filter_Method($this, 'getUrlsafeIdentifier'),
-            'sonata_xeditable_type'         => new \Twig_Filter_Method($this, 'getXEditableType'),
+            'render_list_element'           => new \Twig_Filter_Method($this,   'renderListElement', array('is_safe' => array('html'))),
+            'render_view_element'           => new \Twig_Filter_Method($this,   'renderViewElement', array('is_safe' => array('html'))),
+            'render_view_element_compare'   => new \Twig_Filter_Method($this,   'renderViewElementCompare', array('is_safe' => array('html'))),
+            'render_relation_element'       => new \Twig_Filter_Method($this,   'renderRelationElement'),
+            'sonata_urlsafeid'              => new \Twig_Filter_Method($this,   'getUrlsafeIdentifier'),
+            'sonata_xeditable_type'         => new \Twig_Filter_Method($this,   'getXEditableType'),
+        );
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+
+    public function getFunctions()
+    {
+        return array(
+            'sonata_knp_menu_build' => new \Twig_Function_Method($this, 'getKnpMenu')
         );
     }
 
@@ -343,4 +364,55 @@ class SonataAdminExtension extends \Twig_Extension
 
         return isset($mapping[$type]) ? $mapping[$type] : false;
     }
+
+    /**
+     * Get KnpMenu
+     *
+     * @param Request $request
+     *
+     * @return ItemInterface
+     */
+    public function getKnpMenu(Request $request = null)
+    {
+        $menuFactory = new MenuFactory();
+        $menu = $menuFactory
+            ->createItem('root')
+            ->setExtra('request', $request)
+        ;
+
+        foreach ($this->pool->getAdminGroups() as $name => $group) {
+            $menu
+                ->addChild($name, array('label' => $group['label']))
+                ->setAttributes(
+                    array(
+                        'icon'             => $group['icon'],
+                        'label_catalogue'  => $group['label_catalogue']
+                    )
+                )
+                ->setExtra('roles', $group['roles'])
+            ;
+
+            foreach ($group['items'] as $item) {
+                if (array_key_exists('admin', $item) && $item['admin'] != null) {
+                    $admin             = $this->pool->getInstance($item['admin']);
+                    $label             = $admin->getLabel();
+                    $route             = $admin->generateUrl('list');
+                    $translationDomain = $admin->getTranslationDomain();
+                } else {
+                    $label             = $item['label'];
+                    $route             = $this->router->generate($item['route'], $item['route_params']);
+                    $translationDomain = null;
+                    $admin             = null;
+                }
+
+                $menu[$name]
+                    ->addChild($label, array('uri' => $route))
+                    ->setExtra('translationdomain', $translationDomain)
+                    ->setExtra('admin', $admin)
+                ;
+            }
+        }
+
+        return $menu;
+    }
 }