Merge pull request #2135 from omeka/linked-resources-display

Return nothing when resource has no subject values
omeka · Dec 18, 2023 · d7ff0fc · d7ff0fc
2 parents e91bc65 + 9ad3d13
commit d7ff0fc
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/application/src/Api/Representation/AbstractResourceEntityRepresentation.php b/application/src/Api/Representation/AbstractResourceEntityRepresentation.php
@@ -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.