Merging changes from master

DependencyInjection/SonataBaseApplicationExtension.php

@@ -46,11 +46,13 @@ class SonataBaseApplicationExtension extends Extension
     public function load(array $configs, ContainerBuilder $container)
     {
 
+        $config = call_user_func_array('array_merge_recursive', $config);
+        
         // loads config from external files
         $this->configLoadFiles($container);
         
         // setups parameters with values in config.yml, default values from external files used if not
-        $this->configSetup($configs, $container);
+        $this->configSetup($config, $container);
 
         // register the twig extension
         $container
@@ -72,24 +74,21 @@ class SonataBaseApplicationExtension extends Extension
         // registers crud action
         $definition = new Definition('Sonata\BaseApplicationBundle\Admin\Pool');
         $definition->addMethodCall('setContainer', array(new Reference('service_container')));
-        foreach ($configs as $config) {
-            if(isset($config['entities'])) {
-                foreach ($config['entities'] as $code => $configuration) {
-                    if (!isset($configuration['group'])) {
-                        $configuration['group'] = 'default';
-                    }
-
-                    if (!isset($configuration['label'])) {
-                        $configuration['label'] = $code;
-                    }
+        
+        foreach ($config['entities'] as $code => $configuration) {
+            if (!isset($configuration['group'])) {
+                $configuration['group'] = 'default';
+            }
 
-                    if (!isset($configuration['children'])) {
-                        $configuration['children'] = array();
-                    }
+            if (!isset($configuration['label'])) {
+                $configuration['label'] = $code;
+            }
 
-                    $definition->addMethodCall('addConfiguration', array($code, $configuration));
-                }
+            if (!isset($configuration['children'])) {
+                $configuration['children'] = array();
             }
+
+            $definition->addMethodCall('addConfiguration', array($code, $configuration));
         }
 
         $container->setDefinition('sonata_base_application.admin.pool', $definition);

Resources/views/CRUD/base_inline_edit_field.html.twig

@@ -9,7 +9,7 @@ file that was distributed with this source code.
 
 #}
 
-<div id="sonata-ba-field-container-{{ admin.uniqid }}-{{ field_element.id}}" class="sonata-ba-field sonata-ba-field-{{ edit }}-{{ inline }} {% if field_element.haserrors %}sonata-ba-field-error{% endif %}">
+<div id="sonata-ba-field-container-{{ admin.uniqid }}-{{ field_element.id }}" class="sonata-ba-field sonata-ba-field-{{ edit }}-{{ inline }} {% if field_element.haserrors %}sonata-ba-field-error{% endif %}">
     {% block field %}{{ form_field(field_element) }}{% endblock %}
 
     <div class="sonata-ba-field-error-messages">

Resources/views/CRUD/base_standard_edit_field.html.twig

@@ -9,7 +9,7 @@ file that was distributed with this source code.
 
 #}
 
-<div id="sonata-ba-field-container-{{ admin.uniqid }}-{{ field_element.id}}">
+<div id="sonata-ba-field-container-{{ admin.uniqid }}-{{ field_element.id }}">
     {% block label %}
         {% if field_description.options.name is defined %}
             {{ form_label(field_element, field_description.options.name) }}

Resources/views/CRUD/edit_many_association_script.html.twig

@@ -47,8 +47,8 @@ This code manage the many-to-[one|many] association field popup
             return;
         }
 
-        jQuery('#{{ field_element.id}}').val(element.attr('objectId'));
-        jQuery('#{{ field_element.id}}').trigger('change');
+        jQuery('#{{ field_element.id }}').val(element.attr('objectId'));
+        jQuery('#{{ field_element.id }}').trigger('change');
 
         field_dialog_{{ admin.uniqid }}_{{ field_element.id }}.dialog('close');
     }
@@ -195,9 +195,9 @@ This code manage the many-to-[one|many] association field popup
                            in this case we update the hidden input, and call the change event to
                            retrieve the post information
                         #}
-                        console.log(jQuery('#{{ field_element.id}}'));
-                        jQuery('#{{ field_element.id}}').val(data.objectId);
-                        jQuery('#{{ field_element.id}}').change();
+                        console.log(jQuery('#{{ field_element.id }}'));
+                        jQuery('#{{ field_element.id }}').val(data.objectId);
+                        jQuery('#{{ field_element.id }}').change();
 
                     {% else %}
 
@@ -209,10 +209,10 @@ This code manage the many-to-[one|many] association field popup
                                 'uniqid':    admin.root.uniqid,
                                 'code':      admin.root.code
                             }) }}',
-                            data: jQuery('#field_widget_{{ admin.uniqid }}_{{ field_element.id}}').closest('form').serializeArray(),
+                            data: jQuery('#field_widget_{{ admin.uniqid }}_{{ field_element.id }}').closest('form').serializeArray(),
                             type: 'POST',
                             success: function(html) {
-                                jQuery('#field_widget_{{ admin.uniqid }}_{{ field_element.id}}').html(html);
+                                jQuery('#field_widget_{{ admin.uniqid }}_{{ field_element.id }}').html(html);
                             }
                         });
 
@@ -301,7 +301,7 @@ This code manage the many-to-[one|many] association field popup
         #}
 
         // update the 
-        jQuery('#{{ field_element.id}}').live('change', function(event) {
+        jQuery('#{{ field_element.id }}').live('change', function(event) {
             jQuery.ajax({
                 type: 'GET',
                 url: '{{ url('sonata_base_application_short_object_information', {
@@ -310,7 +310,7 @@ This code manage the many-to-[one|many] association field popup
                     'code': field_description.associationadmin.code
                 })}}'.replace('OBJECT_ID', jQuery(this).val()),
                 success: function(html) {
-                    jQuery('#field_widget_{{ admin.uniqid }}_{{ field_element.id}}').html(html);
+                    jQuery('#field_widget_{{ admin.uniqid }}_{{ field_element.id }}').html(html);
                 }
             });
         });

Resources/views/CRUD/edit_many_to_many.html.twig

@@ -12,12 +12,12 @@ file that was distributed with this source code.
 {% extends base_template %}
 
 {% block field %}
-    <div id="field_container_{{ admin.uniqid }}_{{ field_element.id}}">
-        <span id="field_widget_{{ admin.uniqid }}_{{ field_element.id}}" >
+    <div id="field_container_{{ admin.uniqid }}_{{ field_element.id }}">
+        <span id="field_widget_{{ admin.uniqid }}_{{ field_element.id }}" >
             {{ form_field(field_element) }}
         </span>
         
-        <span id="field_actions_{{ admin.uniqid }}_{{ field_element.id}}" >
+        <span id="field_actions_{{ admin.uniqid }}_{{ field_element.id }}" >
             <a
                 href="{{ field_description.associationadmin.generateUrl('create') }}"
                 onclick="start_field_dialog_form_add_{{ admin.uniqid }}_{{ field_element.id }}(event)"

Resources/views/CRUD/edit_many_to_one.html.twig

@@ -19,10 +19,10 @@ file that was distributed with this source code.
 
     {% else %}
 
-        <div id="field_container_{{ admin.uniqid }}_{{ field_element.id}}">
+        <div id="field_container_{{ admin.uniqid }}_{{ field_element.id }}">
 
             {% if field_description.options.edit == 'list' %}
-                <span id="field_widget_{{ admin.uniqid }}_{{ field_element.id}}" >
+                <span id="field_widget_{{ admin.uniqid }}_{{ field_element.id }}" >
                     {% if value.id %}
                         {% render 'SonataBaseApplicationBundle:Core:getShortObjectDescription' with {
                             'code': field_description.associationadmin.code,
@@ -35,12 +35,12 @@ file that was distributed with this source code.
                     {{ form_field(field_element) }}
                 </span>
             {% else %}
-                <span id="field_widget_{{ admin.uniqid }}_{{ field_element.id}}" >
+                <span id="field_widget_{{ admin.uniqid }}_{{ field_element.id }}" >
                     {{ form_field(field_element) }}
                 </span>
             {% endif %}
             
-            <span id="field_actions_{{ admin.uniqid }}_{{ field_element.id}}" >
+            <span id="field_actions_{{ admin.uniqid }}_{{ field_element.id }}" >
 
                 {% if field_description.options.edit == 'list' %}
                     <a href="{{ field_description.associationadmin.generateUrl('list') }}" onclick="start_field_dialog_form_list_{{ admin.uniqid }}_{{ field_element.id }}(event)" class="action"><img src="{{ asset('bundles/sonatabaseapplication/famfamfam/application_view_list.png') }}" alt="{% trans 'btn_add' from 'BaseApplicationBundle' %}" /></a>

Resources/views/CRUD/edit_one_association_script.html.twig

@@ -40,7 +40,7 @@ This code manage the one-to-many association field popup
             type: "POST",
             data: form.serializeArray(),
             success: function(html) {
-                jQuery('#sonata-ba-field-container-{{ admin.uniqid }}-{{ field_element.id}}').replaceWith(html);
+                jQuery('#sonata-ba-field-container-{{ admin.uniqid }}-{{ field_element.id }}').replaceWith(html);
             }
         });
 
@@ -59,7 +59,7 @@ This code manage the one-to-many association field popup
         a.attr('onclick', '');
 
         // initialize component
-        field_widget_{{ admin.uniqid }}_{{ field_element.id }} = jQuery("#field_widget_{{ admin.uniqid }}_{{ field_element.id}}");
+        field_widget_{{ admin.uniqid }}_{{ field_element.id }} = jQuery("#field_widget_{{ admin.uniqid }}_{{ field_element.id }}");
 
         // add the jQuery event to the a element
         a.click(field_add_{{ admin.uniqid }}_{{ field_element.id }});

Resources/views/CRUD/edit_one_to_many.html.twig

@@ -12,8 +12,8 @@ file that was distributed with this source code.
 {% extends base_template %}
 
 {% block field %}
-    <div id="field_container_{{ admin.uniqid }}_{{ field_element.id}}">
-        <span id="field_widget_{{ admin.uniqid }}_{{ field_element.id}}" >
+    <div id="field_container_{{ admin.uniqid }}_{{ field_element.id }}">
+        <span id="field_widget_{{ admin.uniqid }}_{{ field_element.id }}" >
             {% if field_description.options.edit == 'inline' %}
                 {% if inline == 'table' %}
                     <table>
@@ -60,7 +60,7 @@ file that was distributed with this source code.
         </span>
 
         {% if field_description.options.edit == 'inline' %}
-            <span id="field_actions_{{ admin.uniqid }}_{{ field_element.id}}" >
+            <span id="field_actions_{{ admin.uniqid }}_{{ field_element.id }}" >
                 <a
                     href="{{ field_description.associationadmin.generateUrl('create') }}"
                     onclick="start_field_retrieve_{{ admin.uniqid }}_{{ field_element.id }}(event)"
@@ -74,7 +74,7 @@ file that was distributed with this source code.
         
             {% include 'SonataBaseApplicationBundle:CRUD:edit_one_association_script.html.twig' %}
         {% else %}
-            <span id="field_actions_{{ admin.uniqid }}_{{ field_element.id}}" >
+            <span id="field_actions_{{ admin.uniqid }}_{{ field_element.id }}" >
                 <a
                     href="{{ field_description.associationadmin.generateUrl('create') }}"
                     onclick="start_field_dialog_form_add_{{ admin.uniqid }}_{{ field_element.id }}(event)"

Resources/views/CRUD/edit_one_to_one.html.twig

@@ -19,10 +19,10 @@ file that was distributed with this source code.
 
     {% else %}
 
-        <div id="field_container_{{ admin.uniqid }}_{{ field_element.id}}">
+        <div id="field_container_{{ admin.uniqid }}_{{ field_element.id }}">
 
             {% if field_description.options.edit == 'list' %}
-                <span id="field_widget_{{ admin.uniqid }}_{{ field_element.id}}" >
+                <span id="field_widget_{{ admin.uniqid }}_{{ field_element.id }}" >
                     {% if value.id %}
                         {% render 'SonataBaseApplicationBundle:Core:getShortObjectDescription' with {
                             'code': field_description.associationadmin.code,
@@ -35,11 +35,11 @@ file that was distributed with this source code.
                     {{ form_field(field_element) }}
                 </span>
             {% else %}
-                <span id="field_widget_{{ admin.uniqid }}_{{ field_element.id}}" >
+                <span id="field_widget_{{ admin.uniqid }}_{{ field_element.id }}" >
                     {{ form_field(field_element) }}
                 </span>
             {% endif %}
-            <span id="field_actions_{{ admin.uniqid }}_{{ field_element.id}}" >
+            <span id="field_actions_{{ admin.uniqid }}_{{ field_element.id }}" >
 
                 {% if field_description.options.edit == 'list' %}
                     <a href="{{ field_description.associationadmin.generateUrl('list') }}" onclick="start_field_dialog_form_list_{{ admin.uniqid }}_{{ field_element.id }}(event)" class="action"><img src="{{ asset('bundles/sonatabaseapplication/famfamfam/application_view_list.png') }}" alt="{% trans 'btn_add' from 'BaseApplicationBundle' %}" /></a>

SonataBaseApplicationBundle.php

@@ -12,21 +12,7 @@ namespace Sonata\BaseApplicationBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
-class SonataBaseApplicationBundle extends Bundle {
+class SonataBaseApplicationBundle extends Bundle
+{
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getNamespace()
-    {
-        return __NAMESPACE__;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getPath()
-    {
-        return strtr(__DIR__, '\\', '/');
-    }
 }