Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Return nothing when resource has no subject values #2135

Merged
merged 1 commit into from
Dec 18, 2023
Merged

Return nothing when resource has no subject values #2135

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions application/src/Api/Representation/AbstractResourceEntityRepresentation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,10 +548,19 @@ public function displaySubjectValues(array $options = [])
$perPage = $options['perPage'] ?? null;
$siteId = $options['siteId'] ?? null;

$subjectValuePropertiesItems = $adapter->getSubjectValueProperties($this->resource, 'items', $siteId);
$subjectValuePropertiesItemSets = $adapter->getSubjectValueProperties($this->resource, 'item_sets', $siteId);
$subjectValuePropertiesMedia = $adapter->getSubjectValueProperties($this->resource, 'media', $siteId);

if (!$subjectValuePropertiesItems && !$subjectValuePropertiesItemSets && !$subjectValuePropertiesMedia) {
// This resource has no subject values;
return null;
}

$resourcePropertiesAll = [
'items' => $adapter->getSubjectValueProperties($this->resource, 'items', $siteId),
'item_sets' => $adapter->getSubjectValueProperties($this->resource, 'item_sets', $siteId),
'media' => $adapter->getSubjectValueProperties($this->resource, 'media', $siteId),
'items' => $subjectValuePropertiesItems,
'item_sets' => $subjectValuePropertiesItemSets,
'media' => $subjectValuePropertiesMedia,
];
// Find the default resource property by detecting the first resource
// type that has properties.
Expand Down