X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=virtualshelves%2Faddbybiblionumber.pl;h=210e1531e1f991c295b18ceb91de095670e92c62;hb=ca0bde1e7e168982efc8917c5836aeedea183621;hp=e7b459c97327dcf15175161cc0634f2213df6cd0;hpb=a6c9bd0eb55c32d5632625144775271f20aa15f7;p=koha.git diff --git a/virtualshelves/addbybiblionumber.pl b/virtualshelves/addbybiblionumber.pl index e7b459c973..210e1531e1 100755 --- a/virtualshelves/addbybiblionumber.pl +++ b/virtualshelves/addbybiblionumber.pl @@ -1,9 +1,7 @@ #!/usr/bin/perl -#script to provide virtual shelf management -# -# # Copyright 2000-2002 Katipo Communications +# Copyright 2016 Koha Development Team # # This file is part of Koha. # @@ -58,30 +56,34 @@ addbybiblionumber.pl =cut -use strict; -use warnings; +use Modern::Perl; use CGI qw ( -utf8 ); use C4::Biblio; use C4::Output; -use C4::VirtualShelves qw/:DEFAULT GetAllShelves/; use C4::Auth; +use Koha::Virtualshelves; -our $query = new CGI; -our @biblionumber = HandleBiblioPars(); -our $shelfnumber = $query->param('shelfnumber'); -our $newvirtualshelf = $query->param('newvirtualshelf'); -our $newshelf = $query->param('newshelf'); -our $category = $query->param('category'); -our $sortfield = $query->param('sortfield'); +my $query = new CGI; +my $shelfnumber = $query->param('shelfnumber'); +my $newvirtualshelf = $query->param('newvirtualshelf'); +my $newshelf = $query->param('newshelf'); +my $category = $query->param('category'); +my $sortfield = $query->param('sortfield'); my $confirmed = $query->param('confirmed') || 0; -our $authorized = 1; -our $errcode = 0; +my ( $errcode, $authorized ) = ( 0, 1 ); +my @biblionumbers = $query->multi_param('biblionumber'); + +if ( @biblionumbers == 0 && $query->param('biblionumbers') ) { + my $str = $query->param('biblionumbers'); + @biblionumbers = split '/', $str; +} elsif ( @biblionumbers == 1 && $biblionumbers[0] =~ /\// ) { + @biblionumbers = split '/', $biblionumbers[0]; +} -our ( $template, $loggedinuser, $cookie ) = get_template_and_user( - { - template_name => "virtualshelves/addbybiblionumber.tt", +my ( $template, $loggedinuser, $cookie ) = get_template_and_user( + { template_name => "virtualshelves/addbybiblionumber.tt", query => $query, type => "intranet", authnotrequired => 0, @@ -89,121 +91,118 @@ our ( $template, $loggedinuser, $cookie ) = get_template_and_user( } ); -if( $newvirtualshelf) { - HandleNewVirtualShelf(); - exit if $authorized; - ShowTemplate(); #error message -} -elsif($shelfnumber && $confirmed) { - HandleShelfNumber(); - exit if $authorized; - ShowTemplate(); #error message -} -elsif($shelfnumber) { #still needs confirmation - HandleSelectedShelf(); - LoadBib() if $authorized; - ShowTemplate(); -} -else { - HandleSelect(); - LoadBib(); - ShowTemplate(); -} -#end - -sub HandleBiblioPars { - my @bib= $query->param('biblionumber'); - if(@bib==0 && $query->param('biblionumbers')) { - my $str= $query->param('biblionumbers'); - @bib= split '/', $str; - } - elsif(@bib==1 && $bib[0]=~/\//) { - @bib= split '/', $bib[0]; +if ($newvirtualshelf) { + my $shelf = eval { + Koha::Virtualshelf->new( + { + shelfname => $newvirtualshelf, + category => $category, + sortfield => $sortfield, + owner => $loggedinuser, + } + )->store; + }; + if ( $@ or not $shelf ) { + $errcode = 1; + $authorized = 0; + } else { + + for my $biblionumber (@biblionumbers) { + $shelf->add_biblio( $biblionumber, $loggedinuser ); + } + + #Reload the page where you came from + print $query->header; + print ""; + exit; } - return @bib; -} - -sub AddBibliosToShelf { - my ($shelfnumber, @biblionumber)=@_; - for my $bib (@biblionumber){ - AddToShelf($bib, $shelfnumber, $loggedinuser); - } -} -sub HandleNewVirtualShelf { - $shelfnumber = AddShelf( { - shelfname => $newvirtualshelf, - sortfield => $sortfield, - category => $category }, $loggedinuser); - if($shelfnumber == -1) { - $authorized=0; - $errcode=1; #add failed - return; +} elsif ( $shelfnumber && $confirmed ) { + my $shelf = Koha::Virtualshelves->find($shelfnumber); + if ( $shelf->can_biblios_be_added($loggedinuser) ) { + for my $biblionumber (@biblionumbers) { + $shelf->add_biblio( $biblionumber, $loggedinuser ); + } + + #Close this page and return + print $query->header; + print ""; + exit; + } else { + $errcode = 2; #no perm + $authorized = 0; } - AddBibliosToShelf($shelfnumber, @biblionumber); - #Reload the page where you came from - print $query->header; - print ""; -} -sub HandleShelfNumber { - if($authorized= ShelfPossibleAction($loggedinuser, $shelfnumber, 'add')) { - AddBibliosToShelf($shelfnumber, @biblionumber); - #Close this page and return - print $query->header; - print ""; - } - else { - $errcode=2; #no perm - } -} +} elsif ($shelfnumber) { #still needs confirmation + my $shelf = Koha::Virtualshelves->find($shelfnumber); + if ( $shelf->can_biblios_be_added($loggedinuser) ) { -sub HandleSelectedShelf { - if($authorized= ShelfPossibleAction( $loggedinuser, $shelfnumber, 'add')){ #confirm adding to specific shelf - my ($singleshelf, $singleshelfname)= GetShelf($shelfnumber); $template->param( - singleshelf => 1, - shelfnumber => $singleshelf, - shelfname => $singleshelfname, + singleshelf => 1, + shelfnumber => $shelf->shelfnumber, + shelfname => $shelf->shelfname, ); + } else { + $authorized = 0; + $errcode = 2; #no perm } - else { - $errcode=2; #no perm - } -} -sub HandleSelect { - my $privateshelves = GetAllShelves(1,$loggedinuser,1); - my $publicshelves = GetAllShelves(2,$loggedinuser,1); - $template->param( - privatevirtualshelves => $privateshelves, - publicvirtualshelves => $publicshelves, +} else { + my $private_shelves = Koha::Virtualshelves->search( + { category => 1, + owner => $loggedinuser, + allow_change_from_owner => 1, + }, + { order_by => 'shelfname' } + ); + my $shelves_shared_with_me = Koha::Virtualshelves->search( + { category => 1, + 'virtualshelfshares.borrowernumber' => $loggedinuser, + allow_change_from_others => 1, + }, + { join => 'virtualshelfshares', } + ); + my $public_shelves = Koha::Virtualshelves->search( + { category => 2, + -or => [ + -and => { + allow_change_from_owner => 1, + owner => $loggedinuser, + }, + allow_change_from_others => 1, + ], + }, + { order_by => 'shelfname' } ); -} - -sub LoadBib { - my @biblios; - for my $bib (@biblionumber) { - my $data = GetBiblioData($bib); - push(@biblios, - { biblionumber => $bib, - title => $data->{'title'}, - author => $data->{'author'}, - } ); - } $template->param( - multiple => (scalar(@biblios) > 1), - total => scalar @biblios, - biblios => \@biblios, + private_shelves => $private_shelves, + private_shelves_shared_with_me => $shelves_shared_with_me, + public_shelves => $public_shelves, ); + } -sub ShowTemplate { - $template->param ( - newshelf => $newshelf||0, - authorized => $authorized, - errcode => $errcode, +my @biblios; +for my $biblionumber (@biblionumbers) { + my $data = GetBiblioData($biblionumber); + push( + @biblios, + { biblionumber => $biblionumber, + title => $data->{'title'}, + author => $data->{'author'}, + } ); - output_html_with_http_headers $query, $cookie, $template->output; } +$template->param( + multiple => ( scalar(@biblios) > 1 ), + total => scalar @biblios, + biblios => \@biblios, +); + +$template->param( + newshelf => $newshelf || 0, + authorized => $authorized, + errcode => $errcode, +); +output_html_with_http_headers $query, $cookie, $template->output;