tonyair
/
silverstripe-restfulserver
mirror of https://github.com/silverstripe/silverstripe-restfulserver
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge 6dc4e0bd5b into 78374ee57c

This commit is contained in:
jcdarwin 2015-11-23 17:54:54 +00:00
parent 78374ee57c 6dc4e0bd5b
commit 245fe1c9ad
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/RestfulServer.php
View File

@ -509,9 +509,9 @@ class RestfulServer extends Controller {
protected function getObjectRelationQuery($obj, $params, $sort, $limit, $relationName) {
// The relation method will return a DataList, that getSearchQuery subsequently manipulates
if($obj->hasMethod($relationName)) {
if($relationClass = $obj->has_one($relationName)) {
$joinField = $relationName . 'ID';
$list = DataList::create($relationClass)->byIDs(array($obj->$joinField));
if($obj->has_one($relationName) || $obj->has_many($relationName)) {
$relationClass = $obj->has_one($relationName) ? $obj->has_one($relationName) : $obj->has_many($relationName);
$list = DataList::create($obj->ClassName)->relation($relationName)->forForeignID(array($obj->ID));
} else {
$list = $obj->$relationName();
}