Browse Source

Merge pull request #13 from hanken/master

Make Entity Manager configurable.
Thomas 13 years ago
parent
commit
3ea84a082e
2 changed files with 9 additions and 2 deletions
  1. 1 0
      DependencyInjection/Configuration.php
  2. 8 2
      Resources/config/doctrine_orm.xml

+ 1 - 0
DependencyInjection/Configuration.php

@@ -37,6 +37,7 @@ class Configuration implements ConfigurationInterface
 
         $rootNode
             ->children()
+             ->scalarNode('model_manager')->defaultValue('doctrine.orm.default_entity_manager')->end()
                 ->arrayNode('templates')
                     ->addDefaultsIfNotSet()
                     ->children()

+ 8 - 2
Resources/config/doctrine_orm.xml

@@ -3,11 +3,17 @@
 <container xmlns="http://symfony.com/schema/dic/services"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
+    <parameters>
+           <parameter key="sonata_doctrine_orm_admin.model_manager" />
+    </parameters>
+    
     <services>
+          <service id="sonata.admin.entity_manager" factory-service="doctrine" factory-method="getEntityManager" class="Doctrine\ORM\EntityManager" public="false">
+            <argument>%sonata_doctrine_orm_admin.model_manager%</argument>
+        </service>
 
         <service id="sonata.admin.manager.orm" class="Sonata\DoctrineORMAdminBundle\Model\ModelManager">
-            <argument type="service" id="doctrine.orm.default_entity_manager" />
+            <argument type="service" id="sonata.admin.entity_manager" />
         </service>
 
         <!-- FormBuilder -->