Merge branch '2.0'

phptek · May 25, 2018 · 489f8c5 · 489f8c5
2 parents cacf25f + 3c1055e
commit 489f8c5
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/DataFormatter/JSONDataFormatter.php b/src/DataFormatter/JSONDataFormatter.php
@@ -108,6 +108,9 @@ public function convertDataObjectToJSONObject(DataObjectInterface $obj, $fields
                 if ($this->customRelations && !in_array($relName, $this->customRelations)) {
                     continue;
                 }
+                if ($obj->$relName() && (!$obj->$relName()->exists() || !$obj->$relName()->canView())) {
+                    continue;
+                }
 
                 $fieldName = $relName . 'ID';
                 $rel = $this->config()->api_base;
@@ -144,6 +147,9 @@ public function convertDataObjectToJSONObject(DataObjectInterface $obj, $fields
                 $innerParts = array();
                 $items = $obj->$relName();
                 foreach ($items as $item) {
+                    if (!$item->canView()) {
+                        continue;
+                    }
                     $rel = $this->config()->api_base . $this->sanitiseClassName($relClass) . "/$item->ID";
                     $href = Director::absoluteURL($rel);
                     $innerParts[] = ArrayData::array_to_object(array(