tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2572 from Zauberfisch/api-getRemoteJoinField-enhancement-2570

Browse Source 
API: DataObject->getRemoteJoinField() no longer defaults to ParentID but throws an exception instead
This commit is contained in:
Ingo Schommer 2013-10-23 13:59:37 -07:00
commit ed6e45610f
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
model/DataObject.php
View File

@ -1532,15 +1532,24 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
if($fieldPos = strpos($remoteClass, '.')) { if($fieldPos = strpos($remoteClass, '.')) {
return substr($remoteClass, $fieldPos + 1) . 'ID'; return substr($remoteClass, $fieldPos + 1) . 'ID';
} }
$remoteRelations = array_flip(Config::inst()->get($remoteClass, 'has_one')); $remoteRelations = Config::inst()->get($remoteClass, 'has_one');
if(!is_array($remoteRelations)) {
$remoteRelations = array();
}
$remoteRelations = array_flip($remoteRelations);
// look for remote has_one joins on this class or any parent classes // look for remote has_one joins on this class or any parent classes
foreach(array_reverse(ClassInfo::ancestry($this)) as $class) { foreach(array_reverse(ClassInfo::ancestry($this)) as $class) {
if(array_key_exists($class, $remoteRelations)) return $remoteRelations[$class] . 'ID'; if(array_key_exists($class, $remoteRelations)) return $remoteRelations[$class] . 'ID';
} }
return 'ParentID'; $message = "No has_one found on class '$remoteClass'";
if($type == 'has_many') {
// include a hint for missing has_many that is missing a has_one
$message .= ", the has_many relation from '$this->class' to '$remoteClass' requires a has_one on '$remoteClass'";
}
throw new Exception($message);
} }
/** /**