Accept more types on boolean flags

Daniel-KM · Oct 12, 2021 · 5dece9e · 5dece9e
1 parent 284f4f4
commit 5dece9e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/application/src/Api/Adapter/AbstractResourceEntityAdapter.php b/application/src/Api/Adapter/AbstractResourceEntityAdapter.php
@@ -88,7 +88,7 @@ public function buildQuery(QueryBuilder $qb, array $query)
  }
  }
 
- if (isset($query['is_public']) && is_numeric($query['is_public'])) {
+ if (isset($query['is_public']) && (is_numeric($query['is_public']) || is_bool($query['is_public']))) {
  $qb->andWhere($qb->expr()->eq(
  'omeka_root.isPublic',
  $this->createNamedParameter($qb, (bool) $query['is_public'])

diff --git a/application/src/Api/Adapter/SiteAdapter.php b/application/src/Api/Adapter/SiteAdapter.php
@@ -300,7 +300,7 @@ public function buildQuery(QueryBuilder $qb, array $query)
  ));
  }
 
- if (isset($query['assign_new_items']) && is_numeric($query['assign_new_items'])) {
+ if (isset($query['assign_new_items']) && (is_numeric($query['assign_new_items']) || is_bool($query['assign_new_items']))) {
  $qb->andWhere($qb->expr()->eq(
  'omeka_root.assignNewItems',
  $this->createNamedParameter($qb, (bool) $query['assign_new_items'])

diff --git a/application/src/Api/Adapter/SitePageAdapter.php b/application/src/Api/Adapter/SitePageAdapter.php
@@ -71,7 +71,7 @@ public function buildQuery(QueryBuilder $qb, array $query)
  ));
  }
 
- if (isset($query['is_public']) && is_numeric($query['is_public'])) {
+ if (isset($query['is_public']) && (is_numeric($query['is_public']) || is_bool($query['is_public']))) {
  $qb->andWhere($qb->expr()->eq(
  'omeka_root.isPublic',
  $this->createNamedParameter($qb, (bool) $query['is_public'])

diff --git a/application/view/omeka/admin/item/manage-sites.phtml b/application/view/omeka/admin/item/manage-sites.phtml
@@ -2,7 +2,7 @@
 if ($item) {
  $siteRepresentations = $item->sites();
 } else {
- $siteRepresentations = $this->api()->search('sites', ['assign_new_items' => 1])->getContent();
+ $siteRepresentations = $this->api()->search('sites', ['assign_new_items' => true])->getContent();
 
  $userDefaultSites = $this->userSetting('default_item_sites');
  if (is_array($userDefaultSites)) {