Skip to content
Snippets Groups Projects
Commit 25382684 authored by Chris Hallberg's avatar Chris Hallberg
Browse files

PR#903 - Fav action direct download.

parent f648d16a
No related merge requests found
...@@ -339,7 +339,10 @@ class CartController extends AbstractBase ...@@ -339,7 +339,10 @@ class CartController extends AbstractBase
$msg = [ $msg = [
'translate' => false, 'html' => true, 'translate' => false, 'html' => true,
'msg' => $this->getViewRenderer()->render( '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); return $this->redirectToSource('success', $msg);
......
...@@ -72,7 +72,13 @@ VuFind.register('lightbox', function Lightbox() { ...@@ -72,7 +72,13 @@ VuFind.register('lightbox', function Lightbox() {
var htmlDiv = $('<div/>').html(content); var htmlDiv = $('<div/>').html(content);
var alerts = htmlDiv.find('.flash-message.alert-success'); var alerts = htmlDiv.find('.flash-message.alert-success');
if (alerts.length > 0) { 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; return;
} }
// Deframe HTML // Deframe HTML
......
<div class="text-center"> <div class="text-center">
<?=$this->transEsc('export_success')?>&nbsp;&mdash;&nbsp; <?=$this->transEsc('export_success')?>&nbsp;&mdash;&nbsp;
<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> </div>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment