Permalink
Browse files

Fix #2721 in TranslateBehavior::beforeFind() supporting both Model::…

…field('fieldname') and Model::read('fieldname')
  • Loading branch information...
joostdekeijzer
joostdekeijzer committed Jan 29, 2014
1 parent 9b4c2f3 commit 987187ef8ce387ff460c9a06337ee2709897c97c
@@ -139,6 +139,8 @@ public function beforeFind(Model $Model, $query) {
}
unset($this->_joinTable, $this->_runtimeModel);
return $query;
+ } elseif (is_string($query['fields'])) {
+ $query['fields'] = String::tokenize($query['fields']);
}
$fields = array_merge(
@@ -232,6 +232,32 @@ public function testLocaleSingle() {
)
);
$this->assertEquals($expected, $result);
+
+ $result = $TestModel->field('title', array('TranslatedItem.id' => 1));
+ $expected = 'Title #1';
+ $this->assertEquals($expected, $result);
+
+ $result = $TestModel->read('title', 1);
+ $expected = array(
+ 'TranslatedItem' => array(
+ 'id' => 1,
+ 'slug' => 'first_translated',
+ 'locale' => 'eng',
+ 'title' => 'Title #1',
+ 'translated_article_id' => 1,
+ )
+ );
+ $this->assertEquals($expected, $result);
+
+ $result = $TestModel->read('id, title', 1);
+ $expected = array(
+ 'TranslatedItem' => array(
+ 'id' => 1,
+ 'locale' => 'eng',
+ 'title' => 'Title #1',
+ )
+ );
+ $this->assertEquals($expected, $result);
}
/**

0 comments on commit 987187e

Please sign in to comment.