adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-02-07 12:36:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing issues with translatable field aliasing in TranslateBehavior

Browse source
This commit is contained in:
José Lorenzo Rodríguez 2010-10-26 18:22:13 -04:30
parent cc32ac8904
commit ce490b1df2
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cake/libs/model/behaviors/translate.php
View file

@ -131,8 +131,10 @@ class TranslateBehavior extends ModelBehavior {
$this->runtime[$model->alias]['virtualFields'] = $model->virtualFields; $this->runtime[$model->alias]['virtualFields'] = $model->virtualFields;
if ($addFields) { if ($addFields) {
foreach ($addFields as $field) { foreach ($addFields as $_f => $field) {
foreach (array($field, $model->alias.'.'.$field) as $_field) { $aliasField = is_numeric($_f) ? $field : $_f;
foreach (array($aliasField, $model->alias.'.'.$aliasField) as $_field) {
$key = array_search($_field, (array)$query['fields']); $key = array_search($_field, (array)$query['fields']);
if ($key !== false) { if ($key !== false) {
@ -153,7 +155,7 @@ class TranslateBehavior extends ModelBehavior {
'conditions' => array( 'conditions' => array(
$model->alias . '.' . $model->primaryKey => $db->identifier("I18n__{$field}__{$_locale}.foreign_key"), $model->alias . '.' . $model->primaryKey => $db->identifier("I18n__{$field}__{$_locale}.foreign_key"),
'I18n__'.$field.'__'.$_locale.'.model' => $model->name, 'I18n__'.$field.'__'.$_locale.'.model' => $model->name,
'I18n__'.$field.'__'.$_locale.'.'.$RuntimeModel->displayField => $field, 'I18n__'.$field.'__'.$_locale.'.'.$RuntimeModel->displayField => $aliasField,
'I18n__'.$field.'__'.$_locale.'.locale' => $_locale 'I18n__'.$field.'__'.$_locale.'.locale' => $_locale
) )
); );
@ -170,7 +172,7 @@ class TranslateBehavior extends ModelBehavior {
'conditions' => array( 'conditions' => array(
$model->alias . '.' . $model->primaryKey => $db->identifier("I18n__{$field}.foreign_key"), $model->alias . '.' . $model->primaryKey => $db->identifier("I18n__{$field}.foreign_key"),
'I18n__'.$field.'.model' => $model->name, 'I18n__'.$field.'.model' => $model->name,
'I18n__'.$field.'.'.$RuntimeModel->displayField => $field 'I18n__'.$field.'.'.$RuntimeModel->displayField => $aliasField
) )
); );