Merge branch 'release-4.1'

module/VuFind/src/VuFind/Search/Solr/Params.php

@@ -252,6 +252,18 @@ class Params extends \VuFind\Search\Base\Params
         $this->facetLimit = $l;
     }
 
+    /**
+     * Set Facet Limit by Field
+     *
+     * @param array $new Associative array of $field name => $limit
+     *
+     * @return void
+     */
+    public function setFacetLimitByField(array $new)
+    {
+        $this->facetLimitByField = $new;
+    }
+
     /**
      * Set Facet Offset
      *

module/VuFind/src/VuFind/Search/Solr/Results.php

@@ -309,6 +309,8 @@ class Results extends \VuFind\Search\Base\Results
         // Manipulate facet settings temporarily:
         $params->resetFacetConfig();
         $params->setFacetLimit($limit);
+        // Clear field-specific limits, as they can interfere with retrieval:
+        $params->setFacetLimitByField([]);
         if (null !== $page && $limit != -1) {
             $offset = ($page - 1) * $limit;
             $params->setFacetOffset($offset);

themes/bootstrap3/templates/RecordDriver/SolrDefault/list-entry.phtml

@@ -177,7 +177,7 @@
           $dLabel = 'delete-label-' . preg_replace('[\W]', '-', $id);
         ?>
         <div class="dropdown">
-          <i class="fa fa-fw fa-trash-o" aria-hidden="true"></i> <a class="dropdown-toggle" id="<?=$dLabel ?>" role="button" data-toggle="dropdown" data-target="#" href="<?=$deleteUrlGet ?>">
+          <i class="fa fa-fw fa-trash-o" aria-hidden="true"></i> <a class="dropdown-toggle" id="<?=$dLabel ?>" role="button" data-toggle="dropdown" href="<?=$deleteUrlGet ?>">
             <?=$this->transEsc('Delete') ?>
           </a>
           <ul class="dropdown-menu" role="menu" aria-labelledby="<?=$dLabel ?>">