Merge pull request #1398 from dereuromark/master-paginator

PaginatorComponent should use model->order if there are no other order conditions. Fixes #3902
cakephp · Jul 4, 2013 · 7607087 · 7607087
2 parents 7267383 + a620fbb
commit 7607087
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/lib/Cake/Controller/Component/PaginatorComponent.php b/lib/Cake/Controller/Component/PaginatorComponent.php
@@ -396,7 +396,9 @@ public function validateSort(Model $object, array $options, array $whitelist = a
 			}
 			$options['order'] = $order;
 		}
-
+		if (empty($options['order']) && !empty($object->order)) {
+			$options['order'] = $object->order;
+		}
 		return $options;
 	}
 

diff --git a/lib/Cake/Test/Case/Controller/Component/PaginatorComponentTest.php b/lib/Cake/Test/Case/Controller/Component/PaginatorComponentTest.php
@@ -577,6 +577,31 @@ public function testDefaultPaginateParams() {
 		$this->assertEquals(array(3, 2, 1), $results);
 	}
 
+/**
+ * test paginate() and  model default order
+ *
+ * @return void
+ */
+	public function testPaginateOrderModelDefault() {
+		$Controller = new PaginatorTestController($this->request);
+		$Controller->uses = array('PaginatorControllerPost');
+		$Controller->params['url'] = array();
+		$Controller->constructClasses();
+		$Controller->PaginatorControllerPost->order = array(
+			$Controller->PaginatorControllerPost->alias . '.created' => 'desc'
+		);
+
+		$Controller->Paginator->settings = array(
+			'fields' => array('id', 'title', 'created'),
+			'maxLimit' => 10,
+			'paramType' => 'named'
+		);
+		$result = $Controller->Paginator->paginate('PaginatorControllerPost');
+		$expected = array('2007-03-18 10:43:23', '2007-03-18 10:41:23', '2007-03-18 10:39:23');
+		$this->assertEquals($expected, Hash::extract($result, '{n}.PaginatorControllerPost.created'));
+		$this->assertEquals($Controller->PaginatorControllerPost->order, $this->Controller->request['paging']['PaginatorControllerPost']['order']);
+	}
+
 /**
  * test paginate() and virtualField interactions
  *