Browse Source

fix tests

euromark 12 years ago
parent
commit
603f1b77f5

+ 9 - 3
Model/Behavior/LogableBehavior.php

@@ -151,7 +151,7 @@ class LogableBehavior extends ModelBehavior {
 		$defaults = array(
 		$defaults = array(
 			 $this->settings[$Model->alias]['classField'] => null,
 			 $this->settings[$Model->alias]['classField'] => null,
 			 'action' => null,
 			 'action' => null,
-			 'order' => 'created DESC',
+			 'order' => $this->Log->alias . 'id DESC',
 			 $this->settings[$Model->alias]['userKey'] => null,
 			 $this->settings[$Model->alias]['userKey'] => null,
 			 'conditions' => array(),
 			 'conditions' => array(),
 			 $this->settings[$Model->alias]['foreignKey'] => null,
 			 $this->settings[$Model->alias]['foreignKey'] => null,
@@ -223,12 +223,18 @@ class LogableBehavior extends ModelBehavior {
 		if (isset($params[$this->settings[$Model->alias]['classField']])) {
 		if (isset($params[$this->settings[$Model->alias]['classField']])) {
 			$conditions[$this->settings[$Model->alias]['classField']] = $params[$this->settings[$Model->alias]['classField']];
 			$conditions[$this->settings[$Model->alias]['classField']] = $params[$this->settings[$Model->alias]['classField']];
 		}
 		}
+		$order = array($this->Log->alias . '.id' => 'DESC');
+		if (isset($params['order'])) {
+			$order = $params['order'];
+		}
+
 		$data = $this->Log->find('all', array(
 		$data = $this->Log->find('all', array(
 			'conditions' => $conditions,
 			'conditions' => $conditions,
 			'recursive' => -1,
 			'recursive' => -1,
-			'fields' => $fields
+			'fields' => $fields,
+			'order' => $order
 		));
 		));
-		if (! isset($params['events']) || (isset($params['events']) && $params['events'] == false)) {
+		if (!isset($params['events']) || (isset($params['events']) && $params['events'] == false)) {
 			return $data;
 			return $data;
 		}
 		}
 		$result = array();
 		$result = array();

+ 3 - 3
Test/Case/Model/Behavior/LogableBehaviorTest.php

@@ -150,16 +150,16 @@ class LogableBehaviorTest extends CakeTestCase {
 
 
 	public function testFindUserActions() {
 	public function testFindUserActions() {
 		$expected = array(
 		$expected = array(
-			0 => array('LogableLog' => array('id' => 3)),
-			1 => array('LogableLog' => array('id' => 5))
+			array('LogableLog' => array('id' => 5)),
+			array('LogableLog' => array('id' => 3)),
 		);
 		);
 		$result = $this->LogableBook->findUserActions(301, array('fields' => 'id'));
 		$result = $this->LogableBook->findUserActions(301, array('fields' => 'id'));
 		$this->assertEquals($expected, $result);
 		$this->assertEquals($expected, $result);
 
 
 		$expected = array(
 		$expected = array(
-			array('LogableLog' => array('id' => 1, 'event' => 'Alexander added a logablebook(id 6)')),
 			array('LogableLog' => array('id' => 4, 'event' => 'Alexander deleted the logablebook(id 6)')),
 			array('LogableLog' => array('id' => 4, 'event' => 'Alexander deleted the logablebook(id 6)')),
 			array('LogableLog' => array('id' => 2, 'event' => 'Alexander edited title of logablebook(id 6)')),
 			array('LogableLog' => array('id' => 2, 'event' => 'Alexander edited title of logablebook(id 6)')),
+			array('LogableLog' => array('id' => 1, 'event' => 'Alexander added a logablebook(id 6)')),
 		);
 		);
 		$result = $this->LogableBook->findUserActions(66, array('events' => true));
 		$result = $this->LogableBook->findUserActions(66, array('events' => true));
 		$this->assertEquals($expected, $result);
 		$this->assertEquals($expected, $result);