(bug #3363) do not reload parent if you add a biblio in shelf

[koha.git] / opac / opac-addbybiblionumber.pl
diff --git a/opac/opac-addbybiblionumber.pl b/opac/opac-addbybiblionumber.pl

index d72b7c0..9e67b12 100755 (executable)
--- a/opac/opac-addbybiblionumber.pl
+++ b/opac/opac-addbybiblionumber.pl
@@ -66,7 +66,7 @@ if ($newvirtualshelf) {
         AddBibliosToShelf($shelfnumber, @biblionumber);
         RefreshShelvesSummary($query->cookie("CGISESSID"),$loggedinuser,($loggedinuser == -1 ? 20 : 10));
         print $query->header;
-       print "<html><body onload=\"window.opener.location.reload(true);self.close();\"></body></html>";
+       print "<html><meta http-equiv=\"refresh\" content=\"0;url=opac-shelves.pl?display=privateshelves\" /><body onload=\"window.opener.location.reload(true);self.close();\"></body></html>";
         exit;
  }
  
@@ -80,7 +80,7 @@ if ($shelfnumber && ($shelfnumber != -1)) {
         AddBibliosToShelf($shelfnumber,@biblionumber);
         RefreshShelvesSummary($query->cookie("CGISESSID"),$loggedinuser,($loggedinuser == -1 ? 20 : 10));
         print $query->header;
-       print "<html><body onload=\"window.opener.location.reload(true);self.close();\"></body></html>";
+       print "<html><meta http-equiv=\"refresh\" content=\"0;url=opac-shelves.pl?display=privateshelves\" /><body onload=\"self.close();\"></body></html>";
         exit;
  }
  else {
@@ -95,21 +95,17 @@ else {
                         );
         } else {
         # offer choice of shelves
-       # first private shelves...
         my $limit = 10;
-       my ($shelflist) = GetRecentShelves(1, $limit, $loggedinuser);
      my @shelvesloop;
      my %shelvesloop;
-    for my $shelf ( @{ $shelflist->[0] } ) {
-        push( @shelvesloop, $shelf->{shelfnumber} );
-               $shelvesloop{$shelf->{shelfnumber}} = $shelf->{shelfname};
-       }
-       # then open shelves...
-       my ($shelflist) = GetRecentShelves(3, $limit, undef);
-    for my $shelf ( @{ $shelflist->[0] } ) {
-        push( @shelvesloop, $shelf->{shelfnumber} );
-               $shelvesloop{$shelf->{shelfnumber}} = $shelf->{shelfname};
-       }
+    #grab each type of shelf, open (type 3) should not be limited by user.
+    foreach my $shelftype (1,2,3) {
+        my ($shelflist) = GetRecentShelves($shelftype, $limit, $shelftype == 3 ? undef : $loggedinuser);
+        for my $shelf (@{ $shelflist->[0] }) {
+            push(@shelvesloop, $shelf->{shelfnumber});
+            $shelvesloop{$shelf->{shelfnumber}} = $shelf->{shelfname};
+        }
+    }
      my $CGIvirtualshelves;
      if ( @shelvesloop > 0 ) {
          $CGIvirtualshelves = CGI::scrolling_list (