Skip to content

Commit

Permalink
Remove "in site pool" option from pool settings
Browse files Browse the repository at this point in the history
It's nonfunctional anyway; we throw that key out when calculating a pool
to avoid issues of recursion. The key only works for a regular search.

(fix #1461)
  • Loading branch information
zerocrates committed Nov 15, 2019
1 parent 56b3cb1 commit 1a92767
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion application/view/common/advanced-search.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ $this->headScript()->appendFile($this->assetUrl('js/advanced-search.js', 'Omeka'

$query = isset($query) ? $query : null;
$resourceType = isset($resourceType) ? $resourceType : null;
$isPool = isset($isPool) ? $isPool : null;

$partials = [
'common/advanced-search/fulltext',
Expand All @@ -16,7 +17,7 @@ if ($this->status()->isAdminRequest()) {
switch ($resourceType) {
case 'item':
$partials[] = 'common/advanced-search/item-sets';
if ($this->status()->isAdminRequest()) {
if ($this->status()->isAdminRequest() && !$isPool) {
$partials[] = 'common/advanced-search/site-pool';
}
break;
Expand Down
2 changes: 1 addition & 1 deletion application/view/omeka/site-admin/index/resources.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ $rowTemplate = '
); ?></p>
<div id="advanced-search"><?php echo $this->partial(
'common/advanced-search',
['query' => $site->itemPool(), 'resourceType' => 'item']
['query' => $site->itemPool(), 'resourceType' => 'item', 'isPool' => true]
); ?></div>
</div>

Expand Down

0 comments on commit 1a92767

Please sign in to comment.