Browse Source

Updating CrudAuthorize to work like ActionsAuthorize.
Updating tests.
Fixes #1749

mark_story 14 years ago
parent
commit
a5fe702624

+ 2 - 1
lib/Cake/Controller/Component/Auth/CrudAuthorize.php

@@ -90,6 +90,7 @@ class CrudAuthorize extends BaseAuthorize {
 			);
 			return false;
 		}
+		$user = array($this->settings['userModel'] => $user);
 		$Acl = $this->_Collection->load('Acl');
 		return $Acl->check(
 			$user,
@@ -97,4 +98,4 @@ class CrudAuthorize extends BaseAuthorize {
 			$this->settings['actionMap'][$request->params['action']]
 		);
 	}
-}
+}

+ 2 - 2
lib/Cake/Test/Case/Controller/Component/Auth/CrudAuthorizeTest.php

@@ -86,7 +86,7 @@ class CrudAuthorizeTest extends CakeTestCase {
 			->with($user, 'Posts', 'read')
 			->will($this->returnValue(true));
 
-		$this->assertTrue($this->auth->authorize($user, $request));
+		$this->assertTrue($this->auth->authorize($user['User'], $request));
 	}
 
 /**
@@ -108,7 +108,7 @@ class CrudAuthorizeTest extends CakeTestCase {
 			->with($user, 'Posts', 'read')
 			->will($this->returnValue(false));
 
-		$this->assertFalse($this->auth->authorize($user, $request));
+		$this->assertFalse($this->auth->authorize($user['User'], $request));
 	}