diff --git a/module/VuFind/src/VuFind/Export.php b/module/VuFind/src/VuFind/Export.php index 27966018627315e18d18c812ba527feb5ae63922..bd95bfa6de1879b40495ac1c350419df8f223061 100644 --- a/module/VuFind/src/VuFind/Export.php +++ b/module/VuFind/src/VuFind/Export.php @@ -74,18 +74,6 @@ class Export $this->exportConfig = $exportConfig; } - /** - * Get bulk export options. - * - * @deprecated use getActiveFormats($context) instead - * - * @return array - */ - public function getBulkOptions() - { - return $this->getActiveFormats('bulk'); - } - /** * Get the URL for bulk export. * diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/ExportTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/ExportTest.php index e3f57eea0bd81724920daf7402ce7b4473e35f03..a4e598765fa7227578c1c1b6493e8db6c9c2910b 100644 --- a/module/VuFind/tests/unit-tests/src/VuFindTest/ExportTest.php +++ b/module/VuFind/tests/unit-tests/src/VuFindTest/ExportTest.php @@ -42,7 +42,7 @@ use Zend\Config\Config; class ExportTest extends \PHPUnit\Framework\TestCase { /** - * Test bulk options using legacy (deprecated) configuration. + * Test options using legacy (deprecated) configuration. * * @return void */ @@ -61,26 +61,7 @@ class ExportTest extends \PHPUnit\Framework\TestCase ], ]; $export = $this->getExport($config); - $this->assertEquals(['foo', 'bar'], $export->getBulkOptions()); - } - - /** - * Test bulk options. - * - * @return void - */ - public function testGetBulkOptions() - { - $config = [ - 'Export' => [ - 'foo' => 'record,bulk', - 'bar' => 'record,bulk', - 'baz' => 0, - 'xyzzy' => 'record', - ], - ]; - $export = $this->getExport($config); - $this->assertEquals(['foo', 'bar'], $export->getBulkOptions()); + $this->assertEquals(['foo', 'bar'], $export->getActiveFormats('bulk')); } /** diff --git a/themes/bootstrap3/templates/search/bulk-action-buttons.phtml b/themes/bootstrap3/templates/search/bulk-action-buttons.phtml index 5955b7d278267de0c6bc04b5d0f34a6ed4d26da2..f9163d3558361e6f95812bb60565c9e0c0b52603 100644 --- a/themes/bootstrap3/templates/search/bulk-action-buttons.phtml +++ b/themes/bootstrap3/templates/search/bulk-action-buttons.phtml @@ -10,7 +10,7 @@ <div class="btn-group"> <?php if (isset($this->showBulkOptions) && $this->showBulkOptions): ?> <input id="ribbon-email" class="btn btn-default" type="submit" name="email" title="<?=$this->transEsc('bookbag_email_selected')?>" value="<?=$this->transEsc('Email')?>"<?php if ($this->formAttr): ?> form="<?=$this->escapeHtmlAttr($this->formAttr) ?>"<?php endif; ?>/> - <?php $exportOptions = $this->export()->getBulkOptions(); if (count($exportOptions) > 0): ?> + <?php $exportOptions = $this->export()->getActiveFormats('bulk'); if (count($exportOptions) > 0): ?> <input id="ribbon-export" class="btn btn-default" type="submit" name="export" title="<?=$this->transEsc('bookbag_export_selected')?>" value="<?=$this->transEsc('Export')?>"<?php if ($this->formAttr): ?> form="<?=$this->escapeHtmlAttr($this->formAttr) ?>"<?php endif; ?>/> <?php endif; ?> <input id="ribbon-print" class="btn btn-default" type="submit" name="print" title="<?=$this->transEsc('bookbag_print_selected')?>" value="<?=$this->transEsc('Print')?>"<?php if ($this->formAttr): ?> form="<?=$this->escapeHtmlAttr($this->formAttr) ?>"<?php endif; ?>/>