Browse Source

Revert "Merge pull request #13 from hanken/master"

This reverts commit 3ea84a082ebb9744d476937bf4702d8debf7ceea, reversing
changes made to c445690945cbf2edb14e2291b4e2544cfc318da9.
Thomas Rabaix 13 năm trước cách đây
mục cha
commit
2fc435a8e8

+ 0 - 1
DependencyInjection/Configuration.php

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

+ 2 - 8
Resources/config/doctrine_orm.xml

@@ -3,17 +3,11 @@
 <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="sonata.admin.entity_manager" />
+            <argument type="service" id="doctrine.orm.default_entity_manager" />
         </service>
 
         <!-- FormBuilder -->