Smarter cart support in combined controller.

module/VuFind/src/VuFind/Controller/CombinedController.php

@@ -131,9 +131,13 @@ class CombinedController extends AbstractSearch
             ->get('VuFind\SearchOptionsPluginManager');
         $config = $this->getServiceLocator()->get('VuFind\Config')->get('combined')
             ->toArray();
+        $supportsCart = false;
         foreach ($config as $current => $settings) {
             $this->adjustQueryForSettings($settings);
             $currentOptions = $options->get($current);
+            if ($currentOptions->supportsCart()) {
+                $supportsCart = true;
+            }
             list($controller, $action)
                 = explode('-', $currentOptions->getSearchAction());
             $combinedResults[$current] = $settings;
@@ -154,7 +158,8 @@ class CombinedController extends AbstractSearch
             array(
                 'results' => $results,
                 'params' => $params,
-                'combinedResults' => $combinedResults
+                'combinedResults' => $combinedResults,
+                'supportsCart' => $supportsCart,
             )
         );
     }

themes/bootstrap/templates/combined/results-list.phtml

@@ -63,8 +63,15 @@
     <?=$this->recommend($current)?>
   <? endforeach; ?>
 <? else: ?>
-  <? $viewType = in_array('list', array_keys($params->getViewList())) ? 'list' : $params->getView(); ?>
-  <?=$this->render('search/list-' . $viewType . '.phtml', array('results' => $results, 'params' => $params))?>
+  <?
+    $viewType = in_array('list', array_keys($params->getViewList()))
+      ? 'list' : $params->getView();
+    $viewParams = array('results' => $results, 'params' => $params);
+    if (!$params->getOptions()->supportsCart()) {
+      $viewParams['hideCartControls'] = true;
+    }
+  ?>
+  <?=$this->render('search/list-' . $viewType . '.phtml', $viewParams)?>
   <? if ($currentSearch['more_link']): ?>
     <p class="pad text-right"><a href="<?=$moreUrl?>"><?=$this->transEsc($currentSearch['more_link'])?> <i class="icon-long-arrow-right"></i></a></p>
   <? endif; ?>

themes/bootstrap/templates/combined/results.phtml

@@ -38,7 +38,7 @@
 ?>
 <?=$this->flashmessages()?>
 <form class="form-inline" method="post" name="bulkActionForm" action="<?=$this->url('cart-home')?>">
-  <? if ($this->cart()->isActive()): ?>
+  <? if ($this->supportsCart && $this->cart()->isActive()): ?>
     <div class="clearfix">
       <?=$this->context($this)->renderInContext('search/bulk-action-buttons.phtml', array('idPrefix' => ''))?>
     </div>