Fix for Bug 6695 - Layout of patron category add/edit form slightly broken

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

index c1ebacf..fd3124b 100755 (executable)
--- a/opac/opac-addbybiblionumber.pl
+++ b/opac/opac-addbybiblionumber.pl
@@ -18,14 +18,16 @@
  # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
  # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
  #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  
  use strict;
+use warnings;
+
  use C4::Biblio;
  use CGI;
-use C4::VirtualShelves qw/:DEFAULT GetRecentShelves RefreshShelvesSummary/;
+use C4::VirtualShelves qw/:DEFAULT GetAllShelves RefreshShelvesSummary/;
  use C4::Auth;
  use C4::Output;
  use C4::Auth qw/get_session/;
@@ -40,7 +42,7 @@ sub AddBibliosToShelf {
          @biblionumber = (split /\//,$biblionumber[0]);
      }
      for my $bib (@biblionumber){
-        AddToShelfFromBiblio($bib, $shelfnumber);
+        AddToShelf($bib, $shelfnumber);
      }
  }
  
@@ -57,7 +59,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
          template_name   => "opac-addbybiblionumber.tmpl",
          query           => $query,
          type            => "opac",
-        authnotrequired => 1,
+        authnotrequired =>( C4::Context->preference("OpacPublic") ? 1 : 0 ),
      }
  );
  
@@ -80,7 +82,7 @@ if ($shelfnumber && ($shelfnumber != -1)) {
         AddBibliosToShelf($shelfnumber,@biblionumber);
         RefreshShelvesSummary($query->cookie("CGISESSID"),$loggedinuser,($loggedinuser == -1 ? 20 : 10));
         print $query->header;
-       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>";
+       print "<html><meta http-equiv=\"refresh\" content=\"0;url=opac-shelves.pl?display=privateshelves\" /><body onload=\"self.close();\"></body></html>";
         exit;
  }
  else {
@@ -94,36 +96,23 @@ else {
                                 "category$singlecategory" => 1
                         );
         } else {
-       # offer choice of shelves
-       my $limit = 10;
-    my @shelvesloop;
-    my %shelvesloop;
-    #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 (
-            -name     => 'shelfnumber',
-            -id     => 'shelfnumber',
-            -values   => \@shelvesloop,
-            -labels   => \%shelvesloop,
-            -size     => 1,
-            -tabindex => '',
-            -multiple => 0
-        );
  
-       $template->param (
-               CGIvirtualshelves       => $CGIvirtualshelves,
-       );
-    }
-       }
+        my $privateshelves = GetAllShelves(1,$loggedinuser);
+        if(@{$privateshelves}){
+                       $template->param (
+                               privatevirtualshelves          => $privateshelves,
+                               existingshelves => 1
+                       );
+               }
+        my $publicshelves = GetAllShelves(2,$loggedinuser);
+        if(@{$publicshelves}){
+                       $template->param (
+                               publicvirtualshelves          => $publicshelves,
+                               existingshelves => 1
+                       );
+        }
  
+}
         my @biblios;
         for my $bib (@biblionumber) {
                 my $data = GetBiblioData( $bib );