浏览代码

Fix one to one inline mode

Thomas Rabaix 14 年之前
父节点
当前提交
2753079ceb
共有 2 个文件被更改,包括 10 次插入1 次删除
  1. 9 0
      Builder/ORM/FormContractor.php
  2. 1 1
      Resources/views/Form/admin_fields.html.twig

+ 9 - 0
Builder/ORM/FormContractor.php

@@ -50,11 +50,20 @@ class FormContractor implements FormContractorInterface
             return $options;
         }
 
+        if ($type == 'sonata_type_admin') {
+            $fieldDescription->setOption('edit', 'inline');
+        }
+
         // tweak the widget depend on the edit mode
         if ($fieldDescription->getOption('edit') == 'inline') {
             return $options;
         }
 
+        if ($fieldDescription->getOption('edit') == 'standard')
+        {
+            return $options;
+        }
+
         $options['class']         = $fieldDescription->getTargetEntity();
         $options['data_class']    = $fieldDescription->getTargetEntity();
         $options['model_manager'] = $fieldDescription->getAdmin()->getModelManager();

+ 1 - 1
Resources/views/Form/admin_fields.html.twig

@@ -14,7 +14,7 @@ file that was distributed with this source code.
 {# Rows #}
 
 {% block field_row %}
-    {% if not sonata_admin.field_description %}
+    {% if not sonata_admin_enabled or not sonata_admin.field_description %}
         {{ parent() }}
     {% else %}
         <div id="sonata-ba-field-container-{{ id }}" style="border: 1px solid red">