diff --git a/module/VuFind/src/VuFind/Controller/CartController.php b/module/VuFind/src/VuFind/Controller/CartController.php index 71e5355dfd9179b7d1034a4a7792bda559b0c685..d3ad3fe8a9bbe487a4f1df5b48f76f6ac199fce8 100644 --- a/module/VuFind/src/VuFind/Controller/CartController.php +++ b/module/VuFind/src/VuFind/Controller/CartController.php @@ -339,7 +339,10 @@ class CartController extends AbstractBase $msg = [ 'translate' => false, 'html' => true, 'msg' => $this->getViewRenderer()->render( - 'cart/export-success.phtml', ['url' => $url] + 'cart/export-success.phtml', [ + 'url' => $url, + 'exportType' => $export->getBulkExportType($format) + ] ) ]; return $this->redirectToSource('success', $msg); diff --git a/themes/bootstrap3/js/lightbox.js b/themes/bootstrap3/js/lightbox.js index ca4019a59a542e81ff4e841cd97115a1f5a586b8..9c82c9d3a86d16d5755d6f1b2a194bc136703bfb 100644 --- a/themes/bootstrap3/js/lightbox.js +++ b/themes/bootstrap3/js/lightbox.js @@ -72,7 +72,13 @@ VuFind.register('lightbox', function Lightbox() { var htmlDiv = $('<div/>').html(content); var alerts = htmlDiv.find('.flash-message.alert-success'); if (alerts.length > 0) { - showAlert(alerts[0].innerHTML, 'success'); + var href = alerts.find('.download').attr('href'); + if (typeof href !== 'undefined') { + location.href = href; + _modal.modal('hide'); + } else { + showAlert(alerts[0].innerHTML, 'success'); + } return; } // Deframe HTML diff --git a/themes/bootstrap3/templates/cart/export-success.phtml b/themes/bootstrap3/templates/cart/export-success.phtml index 913f259893c3540b9e0fb7c7eb65246593c88e47..d3b57410399d54d82099b62798abc2ad4dcdd8f2 100644 --- a/themes/bootstrap3/templates/cart/export-success.phtml +++ b/themes/bootstrap3/templates/cart/export-success.phtml @@ -1,4 +1,4 @@ <div class="text-center"> <?=$this->transEsc('export_success')?> — - <a class="btn btn-primary" href="<?=$this->escapeHtmlAttr($this->url)?>"><?=$this->transEsc('export_download')?></a> + <a class="btn btn-primary <?=$this->exportType?>" href="<?=$this->escapeHtmlAttr($this->url)?>"><?=$this->transEsc('export_download')?></a> </div>