#
# This file is part of Koha.
#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY 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.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
=head1 NAME
- addbybiblionumber.pl
+addbybiblionumber.pl
=head1 DESCRIPTION
use strict;
use warnings;
-use CGI;
+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 ( $template, $loggedinuser, $cookie ) = get_template_and_user(
{
- template_name => "virtualshelves/addbybiblionumber.tmpl",
+ template_name => "virtualshelves/addbybiblionumber.tt",
query => $query,
type => "intranet",
authnotrequired => 0,
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
+ my $shelf = eval {
+ Koha::Virtualshelf->new(
+ {
+ shelfname => $newvirtualshelf,
+ category => $category,
+ sortfield => $sortfield,
+ owner => $loggedinuser,
+ }
+ );
+ }->store;
+ if ( $@ or not $shelf ) {
+ $authorized = 0;
+ $errcode = 1;
return;
}
- AddBibliosToShelf($shelfnumber, @biblionumber);
+
+ for my $bib (@biblionumber){
+ $shelf->add_biblio( $bib, $loggedinuser );
+ }
#Reload the page where you came from
print $query->header;
print "<html><meta http-equiv=\"refresh\" content=\"0\" /><body onload=\"window.opener.location.reload(true);self.close();\"></body></html>";
}
sub HandleShelfNumber {
- if($authorized= ShelfPossibleAction($loggedinuser, $shelfnumber, 'add')) {
- AddBibliosToShelf($shelfnumber, @biblionumber);
- #Close this page and return
- print $query->header;
- print "<html><meta http-equiv=\"refresh\" content=\"0\" /><body onload=\"self.close();\"></body></html>";
+ my $shelf = Koha::Virtualshelves->find( $shelfnumber );
+ if($authorized = $shelf->can_biblios_be_added( $loggedinuser ) ) {
+ for my $bib (@biblionumber){
+ $shelf->add_biblio( $bib, $loggedinuser );
+ }
+ #Close this page and return
+ print $query->header;
+ print "<html><meta http-equiv=\"refresh\" content=\"0\" /><body onload=\"self.close();\"></body></html>";
}
else {
- $errcode=2; #no perm
+ $errcode=2; #no perm
}
}
sub HandleSelectedShelf {
- if($authorized= ShelfPossibleAction( $loggedinuser, $shelfnumber, 'add')){
+ my $shelf = Koha::Virtualshelves->find( $shelfnumber );
+ if($authorized = $shelf->can_biblios_be_added( $loggedinuser ) ) {
#confirm adding to specific shelf
- my ($singleshelf, $singleshelfname, $singlecategory)= GetShelf($shelfnumber);
$template->param(
singleshelf => 1,
- shelfnumber => $singleshelf,
- shelfname => $singleshelfname,
- "category$singlecategory" => 1
+ shelfnumber => $shelf->shelfnumber,
+ shelfname => $shelf->shelfname,
);
}
else {
}
sub HandleSelect {
- my $privateshelves = GetAllShelves(1,$loggedinuser,1);
- my $publicshelves = GetAllShelves(2,$loggedinuser,1);
- $template->param(
- privatevirtualshelves => $privateshelves,
- publicvirtualshelves => $publicshelves,
+ my $private_shelves = Koha::Virtualshelves->search(
+ {
+ category => 1,
+ owner => $loggedinuser,
+ },
+ { order_by => 'shelfname' }
+ );
+ my $shelves_shared_with_me = Koha::Virtualshelves->search(
+ {
+ category => 1,
+ 'virtualshelfshares.borrowernumber' => $loggedinuser,
+ -or => {
+ allow_add => 1,
+ owner => $loggedinuser,
+ }
+ },
+ {
+ join => 'virtualshelfshares',
+ }
+ );
+ my $public_shelves= Koha::Virtualshelves->search(
+ {
+ category => 2,
+ -or => {
+ allow_add => 1,
+ owner => $loggedinuser,
+ }
+ },
+ { order_by => 'shelfname' }
+ );
+ $template->param (
+ private_shelves => $private_shelves,
+ private_shelves_shared_with_me => $shelves_shared_with_me,
+ public_shelves => $public_shelves,
);
}
projects / koha.git / blobdiff