From f979d3ed6e5b3a3264ed8d19fa893ab8f756e176 Mon Sep 17 00:00:00 2001 From: Demian Katz <demian.katz@villanova.edu> Date: Mon, 20 Apr 2015 15:39:15 -0400 Subject: [PATCH] More consistent handling of results object. --- themes/blueprint/templates/Recommend/TopFacets.phtml | 3 ++- themes/bootstrap3/templates/Recommend/TopFacets.phtml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/themes/blueprint/templates/Recommend/TopFacets.phtml b/themes/blueprint/templates/Recommend/TopFacets.phtml index dea8390f0be..702e0222ff0 100644 --- a/themes/blueprint/templates/Recommend/TopFacets.phtml +++ b/themes/blueprint/templates/Recommend/TopFacets.phtml @@ -1,6 +1,7 @@ <? $topFacetSet = $this->recommend->getTopFacetSet(); $topFacetSettings = $this->recommend->getTopFacetSettings(); + $results = $this->recommend->getResults(); ?> <? if (isset($topFacetSet)): ?> <? foreach($topFacetSet as $title => $cluster): ?> @@ -28,7 +29,7 @@ <?=$this->escapeHtml($thisFacet['displayText'])?> <img src="<?=$this->imageLink('silk/tick.png')?>" alt="<?=$this->transEsc('Selected') ?>"/> </a> <? else: ?> - <a href="<?=$this->currentPath().$this->recommend->getResults()->getUrlQuery()->addFacet($title, $thisFacet['value'], $thisFacet['operator'])?>"><?=$this->escapeHtml($thisFacet['displayText'])?></a> (<?=$this->localizedNumber($thisFacet['count']) ?>) + <a href="<?=$this->currentPath().$results->getUrlQuery()->addFacet($title, $thisFacet['value'], $thisFacet['operator'])?>"><?=$this->escapeHtml($thisFacet['displayText'])?></a> (<?=$this->localizedNumber($thisFacet['count']) ?>) <? if ($allowExclude): ?> <a href="<?=$this->currentPath().$results->getUrlQuery()->addFacet($title, $thisFacet['value'], 'NOT')?>"><?=$this->transEsc('exclude_facet')?></a> <? endif; ?> diff --git a/themes/bootstrap3/templates/Recommend/TopFacets.phtml b/themes/bootstrap3/templates/Recommend/TopFacets.phtml index 2591bc526ac..fe0e4232c0e 100644 --- a/themes/bootstrap3/templates/Recommend/TopFacets.phtml +++ b/themes/bootstrap3/templates/Recommend/TopFacets.phtml @@ -2,6 +2,7 @@ // TODO: This file needs love $topFacetSet = $this->recommend->getTopFacetSet(); $topFacetSettings = $this->recommend->getTopFacetSettings(); + $results = $this->recommend->getResults(); ?> <? if (isset($topFacetSet)): ?> <? $row=0; foreach($topFacetSet as $title => $cluster): ?> @@ -29,7 +30,7 @@ <?=$this->escapeHtml($thisFacet['displayText'])?> <i class="fa fa-check"></i> </a> <? else: ?> - <a href="<?=$this->currentPath().$this->recommend->getResults()->getUrlQuery()->addFacet($title, $thisFacet['value'], $thisFacet['operator'])?>"><?=$this->escapeHtml($thisFacet['displayText'])?></a> <span class="badge"><?=$this->localizedNumber($thisFacet['count']) ?> + <a href="<?=$this->currentPath().$results->getUrlQuery()->addFacet($title, $thisFacet['value'], $thisFacet['operator'])?>"><?=$this->escapeHtml($thisFacet['displayText'])?></a> <span class="badge"><?=$this->localizedNumber($thisFacet['count']) ?> <? if ($allowExclude): ?> <a href="<?=$this->currentPath().$results->getUrlQuery()->addFacet($title, $thisFacet['value'], 'NOT')?>" title="<?=$this->transEsc('exclude_facet')?>"><i class="fa fa-times"></i></a> <? endif; ?> -- GitLab