Skip to content
This repository has been archived by the owner on Jan 6, 2023. It is now read-only.

Issue fix #1191 #1192

Merged
merged 1 commit into from
Aug 12, 2019
Merged

Issue fix #1191 #1192

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/core/Directus/Database/TableGateway/RelationalTableGateway.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2049,7 +2049,9 @@ public function loadOneToManyRelationships($entries, $columns, array $params = [
// Only select the fields not on the currently authenticated user group's read field blacklist
$relationalColumnName = $alias->getRelationship()->getFieldMany();
$tableGateway = new RelationalTableGateway($relatedTableName, $this->adapter, $this->acl);
$filterFields = \Directus\get_array_flat_columns($columnsTree[$alias->getName()]);
if(!empty($columnsTree[$alias->getName()])){
$filterFields = \Directus\get_array_flat_columns($columnsTree[$alias->getName()]);
}
$filters = [];

if (ArrayUtils::get($params, 'lang') && DataTypes::isTranslationsType($alias->getType())) {
Expand All @@ -2067,7 +2069,7 @@ public function loadOneToManyRelationships($entries, $columns, array $params = [
}

$results = $tableGateway->fetchItems(array_merge([
'fields' => array_merge([$relationalColumnName], $filterFields),
'fields' => !empty($filterFields) ? array_merge([$relationalColumnName], $filterFields) : [$relationalColumnName],
// Fetch all related data
'limit' => -1,
'filter' => array_merge($filters, [
Expand All @@ -2076,7 +2078,9 @@ public function loadOneToManyRelationships($entries, $columns, array $params = [
], $params));

$relatedEntries = [];
$selectedFields = $tableGateway->getSelectedFields($filterFields);
if(!empty($filterFields)){
$selectedFields = $tableGateway->getSelectedFields($filterFields);
}

foreach ($results as $row) {
// Quick fix
Expand Down