Lightbox: Bulk Actions in MyResearch.

themes/bootstrap3/js/lightbox.js

@@ -98,8 +98,8 @@ VuFind.lightbox = (function() {
         if ( // Close the lightbox after deliberate login
           obj.method                           // is a form
           && !html.match(/alert alert-danger/) // skip failed logins
-          && (obj.url.match(/MyResearch/)      // that matches login/create account
-          || obj.url.match(/catalogLogin/))    // catalog login for holds
+          && ((obj.url.match(/MyResearch/) && !obj.url.match(/Bulk/)) // that matches login/create account
+            || obj.url.match(/catalogLogin/))     // catalog login for holds
         ) {
           if (_originalUrl.match(/UserLogin/) || obj.url.match(/catalogLogin/)) {
             var event = new CustomEvent('VuFind.lightbox.login', {

themes/bootstrap3/templates/myresearch/bulk-action-buttons.phtml

@@ -17,7 +17,7 @@
   <? $exportOptions = $this->export()->getActiveFormats('bulk'); if (count($exportOptions) > 0): ?>
     <input class="btn btn-default" type="submit" name="export" value="<?=$this->transEsc('Export')?>" title="<?=$this->transEsc('export_selected')?>"/>
   <? endif; ?>
-  <input class="btn btn-default" type="submit" name="print" value="<?=$this->transEsc('Print')?>" title="<?=$this->transEsc('print_selected')?>"/>
+  <input class="btn btn-default" type="submit" name="print" value="<?=$this->transEsc('Print')?>" title="<?=$this->transEsc('print_selected')?>" data-lightbox-ignore/>
   <? if ($this->cart()->isActive()): ?>
     <input class="btn btn-default" id="<?=$this->idPrefix?>updateCart" type="submit" name="add" value="<?=$this->transEsc('Add to Book Bag')?>"/>
   <? endif; ?>

themes/bootstrap3/templates/myresearch/mylist.phtml

@@ -55,7 +55,7 @@
           <?=$this->render('search/controls/sort.phtml')?>
         </div>
       </div>
-      <form class="form-inline" method="post" name="bulkActionForm" action="<?=$this->url('cart-myresearchbulk')?>">
+      <form class="form-inline" method="post" name="bulkActionForm" action="<?=$this->url('cart-myresearchbulk')?>" data-lightbox data-lightbox-onsubmit="bulkFormHandler">
         <?=$this->context($this)->renderInContext('myresearch/bulk-action-buttons.phtml', array('idPrefix' => '', 'list' => isset($list) ? $list : null, 'account' => $this->account))?>
         <? foreach ($this->results->getResults() as $i=>$current): ?>
           <?=$this->record($current)->getListEntry($list, $user)?>