瀏覽代碼

Merge pull request #1610 from benscholler/master

Fixing ACL Listing for Cursors
Thomas 11 年之前
父節點
當前提交
efba913af5
共有 2 個文件被更改,包括 3 次插入3 次删除
  1. 1 1
      Controller/CRUDController.php
  2. 2 2
      Util/AdminObjectAclData.php

+ 1 - 1
Controller/CRUDController.php

@@ -770,7 +770,7 @@ class CRUDController extends Controller
 
         $this->admin->setSubject($object);
         $aclUsers = $this->getAclUsers();
-        
+
         $adminObjectAclManipulator = $this->get('sonata.admin.object.manipulator.acl.admin');
         $adminObjectAclData = new AdminObjectAclData(
             $this->admin,

+ 2 - 2
Util/AdminObjectAclData.php

@@ -73,10 +73,10 @@ class AdminObjectAclData
     /**
      * @param \Sonata\AdminBundle\Admin\AdminInterface $admin
      * @param mixed                                    $object
-     * @param array                                    $aclUsers
+     * @param \Traversable                             $aclUsers
      * @param string                                   $maskBuilderClass
      */
-    public function __construct(AdminInterface $admin, $object, array $aclUsers, $maskBuilderClass)
+    public function __construct(AdminInterface $admin, $object, \Traversable $aclUsers, $maskBuilderClass)
     {
         $this->admin = $admin;
         $this->object = $object;