X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=opac%2Fopac-addbybiblionumber.pl;h=fd3124b46bc4f62f6c05764b90215e82a927aacf;hb=18b8991cf1832a0ee79a526e6438b51fdb4f3208;hp=1aab97205045dca749b9bc7a2a1ddd37784aa997;hpb=5eaf32d556dcc2a388b4304acdca3e7d94d983ae;p=koha_fer
diff --git a/opac/opac-addbybiblionumber.pl b/opac/opac-addbybiblionumber.pl
index 1aab972050..fd3124b46b 100755
--- a/opac/opac-addbybiblionumber.pl
+++ b/opac/opac-addbybiblionumber.pl
@@ -18,19 +18,34 @@
# 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/;
use C4::Debug;
+#splits incoming biblionumber(s) to array and adds each to shelf.
+sub AddBibliosToShelf {
+ my ($shelfnumber,@biblionumber)=@_;
+
+ # multiple bibs might come in as '/' delimited string (from where, i don't see), or as array.
+ if (scalar(@biblionumber) == 1) {
+ @biblionumber = (split /\//,$biblionumber[0]);
+ }
+ for my $bib (@biblionumber){
+ AddToShelf($bib, $shelfnumber);
+ }
+}
+
my $query = new CGI;
my @biblionumber = $query->param('biblionumber');
my $selectedshelf = $query->param('selectedshelf');
@@ -44,15 +59,16 @@ 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 ),
}
);
if ($newvirtualshelf) {
$shelfnumber = AddShelf( $newvirtualshelf, $loggedinuser, $category );
+ AddBibliosToShelf($shelfnumber, @biblionumber);
RefreshShelvesSummary($query->cookie("CGISESSID"),$loggedinuser,($loggedinuser == -1 ? 20 : 10));
print $query->header;
- print "";
+ print "";
exit;
}
@@ -62,20 +78,11 @@ if ($selectedshelf) {
$authorized = 0 unless ShelfPossibleAction( $loggedinuser, $selectedshelf );
}
-# multiple bibs might come in as '/' delimited string (from where, i don't see), or as array.
-
-my $multiple = 0;
-my @bibs;
-if (scalar(@biblionumber) == 1) {
- @biblionumber = (split /\//,$biblionumber[0]);
-}
if ($shelfnumber && ($shelfnumber != -1)) {
- for my $bib (@biblionumber){
- AddToShelfFromBiblio($bib,$shelfnumber);
- }
+ AddBibliosToShelf($shelfnumber,@biblionumber);
RefreshShelvesSummary($query->cookie("CGISESSID"),$loggedinuser,($loggedinuser == -1 ? 20 : 10));
print $query->header;
- print "";
+ print "";
exit;
}
else {
@@ -89,40 +96,23 @@ else {
"category$singlecategory" => 1
);
} 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};
- }
- 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 );