Add "used" parameter for vocab members APIs

(fix #1578, different implementation of the parameter part only of #1423)
omeka · Sep 15, 2020 · 8bb1b54 · 8bb1b54
1 parent 8d13af3
commit 8bb1b54
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/application/src/Api/Adapter/PropertyAdapter.php b/application/src/Api/Adapter/PropertyAdapter.php
@@ -115,7 +115,6 @@ public function buildQuery(QueryBuilder $qb, array $query)
                 $this->createNamedParameter($qb, $query['vocabulary_prefix']))
             );
         }
-
         if (isset($query['local_name'])) {
             $qb->andWhere($qb->expr()->eq(
                 "omeka_root.localName",
@@ -138,6 +137,13 @@ public function buildQuery(QueryBuilder $qb, array $query)
                 $this->createNamedParameter($qb, $localName))
             );
         }
+        if (!empty($query['used'])) {
+            $valuesAlias = $this->createAlias();
+            $qb->innerJoin(
+                'omeka_root.values',
+                $valuesAlias,
+            );
+        }
     }
 
     public function validateEntity(EntityInterface $entity, ErrorStore $errorStore)

diff --git a/application/src/Api/Adapter/ResourceClassAdapter.php b/application/src/Api/Adapter/ResourceClassAdapter.php
@@ -128,6 +128,13 @@ public function buildQuery(QueryBuilder $qb, array $query)
                 $this->createNamedParameter($qb, $localName))
             );
         }
+        if (!empty($query['used'])) {
+            $valuesAlias = $this->createAlias();
+            $qb->innerJoin(
+                'omeka_root.resources',
+                $valuesAlias,
+            );
+        }
     }
 
     public function validateEntity(EntityInterface $entity, ErrorStore $errorStore)