浏览代码

Fix #214 - defining `_action` using `configureListFields()` instead of `$list`

Thomas Rabaix 14 年之前
父节点
当前提交
ddea605feb
共有 1 个文件被更改,包括 3 次插入2 次删除
  1. 3 2
      Builder/ORM/ListBuilder.php

+ 3 - 2
Builder/ORM/ListBuilder.php

@@ -41,11 +41,12 @@ class ListBuilder implements ListBuilderInterface
      */
      */
     public function fixFieldDescription(AdminInterface $admin, FieldDescriptionInterface $fieldDescription, array $options = array())
     public function fixFieldDescription(AdminInterface $admin, FieldDescriptionInterface $fieldDescription, array $options = array())
     {
     {
+        $fieldDescription->mergeOptions($options);
+
         if ($fieldDescription->getName() == '_action') {
         if ($fieldDescription->getName() == '_action') {
-          $this->buildActionFieldDescription($fieldDescription);
+            $this->buildActionFieldDescription($fieldDescription);
         }
         }
 
 
-        $fieldDescription->mergeOptions($options);
         $fieldDescription->setAdmin($admin);
         $fieldDescription->setAdmin($admin);
 
 
         if ($admin->getModelManager()->hasMetadata($admin->getClass())) {
         if ($admin->getModelManager()->hasMetadata($admin->getClass())) {