Set viewPath correctly for prefix controllers.

cakephp · Jul 4, 2012 · c68f8b2 · c68f8b2
1 parent 752e039
commit c68f8b2
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/lib/Cake/Controller/Controller.php b/lib/Cake/Controller/Controller.php
@@ -329,7 +329,11 @@ public function __construct($request = null, $response = null) {
 		}
 
 		if ($this->viewPath == null) {
-			$this->viewPath = $this->name;
+			$viewPath = $this->name;
+			if (isset($request->params['prefix'])) {
+				$viewPath = Inflector::camelize($request->params['prefix']) . DS . $viewPath;
+			}
+			$this->viewPath = $viewPath;
 		}
 		if ($this->_mergeParent === null) {
 			$this->_mergeParent = Configure::read('App.namespace') . '\Controller\Controller';

diff --git a/lib/Cake/Test/TestCase/Controller/ControllerTest.php b/lib/Cake/Test/TestCase/Controller/ControllerTest.php
@@ -1444,4 +1444,23 @@ public function testInvokeActionReturnValue() {
 		$this->assertEquals('I am from the controller.', $result);
 	}
 
+/**
+ * test that a classes namespace is used in the viewPath.
+ *
+ * @return void
+ */
+	public function testViewPathConventions() {
+		$request = new Request('admin/posts');
+		$request->addParams(array(
+			'prefix' => 'admin'
+		));
+		$response = $this->getMock('Cake\Network\Response');
+		$Controller = new \TestApp\Controller\Admin\PostsController($request, $response);
+		$this->assertEquals('Admin/Posts', $Controller->viewPath);
+
+		$request = new Request('pages/home');
+		$Controller = new \TestApp\Controller\PagesController($request, $response);
+		$this->assertEquals('Pages', $Controller->viewPath);
+	}
+
 }