From 9af429c33e6494bde0b31d2723abfd606d2076c2 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 18 Aug 2015 10:54:17 +0100 Subject: [PATCH] Bug 14544: Get rid of C4::VirtualShelves and C4::VirtualShelves::Page Signed-off-by: Alex Arnaud Signed-off-by: Marcel de Rooy Signed-off-by: Tomas Cohen Arazi --- C4/ItemType.pm | 2 - C4/VirtualShelves.pm | 122 ---- C4/VirtualShelves/Page.pm | 564 ------------------ basket/downloadcart.pl | 1 - catalogue/detail.pl | 1 - catalogue/search.pl | 1 - opac/opac-addbybiblionumber.pl | 1 - opac/opac-detail.pl | 1 - opac/opac-downloadcart.pl | 1 - opac/opac-downloadshelf.pl | 1 - opac/opac-sendshelf.pl | 1 - opac/opac-shareshelf.pl | 1 - opac/opac-shelves.pl | 1 - .../Utils/Datatables_Virtualshelves.t | 2 - t/db_dependent/VirtualShelves_Page.t | 14 - virtualshelves/addbybiblionumber.pl | 1 - virtualshelves/downloadshelf.pl | 1 - virtualshelves/sendshelf.pl | 1 - virtualshelves/shelves.pl | 1 - 19 files changed, 718 deletions(-) delete mode 100644 C4/VirtualShelves.pm delete mode 100644 C4/VirtualShelves/Page.pm delete mode 100755 t/db_dependent/VirtualShelves_Page.t diff --git a/C4/ItemType.pm b/C4/ItemType.pm index 27b5aeae39..209a77db95 100644 --- a/C4/ItemType.pm +++ b/C4/ItemType.pm @@ -188,8 +188,6 @@ L, L, L, L, -L, -L, L diff --git a/C4/VirtualShelves.pm b/C4/VirtualShelves.pm deleted file mode 100644 index 6c7415589d..0000000000 --- a/C4/VirtualShelves.pm +++ /dev/null @@ -1,122 +0,0 @@ -package C4::VirtualShelves; - -# Copyright 2000-2002 Katipo Communications -# -# 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 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. -# -# You should have received a copy of the GNU General Public License -# along with Koha; if not, see . - -use strict; -use warnings; - -use Carp; -use C4::Context; -use C4::Debug; -use C4::Members; - -use constant SHELVES_MASTHEAD_MAX => 10; #number under Lists button in masthead -use constant SHELVES_COMBO_MAX => 10; #add to combo in search -use constant SHELVES_MGRPAGE_MAX => 20; #managing page -use constant SHELVES_POPUP_MAX => 40; #addbybiblio popup - -use constant SHARE_INVITATION_EXPIRY_DAYS => 14; #two weeks to accept - -use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); - -BEGIN { - # set the version for version checking - $VERSION = 3.07.00.049; - require Exporter; - @ISA = qw(Exporter); - @EXPORT = qw( - ); - @EXPORT_OK = qw( - &ShelvesMax - ); -} - - -=head1 NAME - -C4::VirtualShelves - Functions for manipulating Koha virtual shelves - -=head1 SYNOPSIS - - use C4::VirtualShelves; - -=head1 DESCRIPTION - -This module provides functions for manipulating virtual shelves, -including creating and deleting virtual shelves, and adding and removing -bibs to and from virtual shelves. - -=head1 FUNCTIONS - -=head2 ShelvesMax - - $howmany= ShelvesMax($context); - -Tells how much shelves are shown in which context. -POPUP refers to addbybiblionumber popup, MGRPAGE is managing page (in opac or -staff), COMBO refers to the Add to-combo of search results. MASTHEAD is the -main Koha toolbar with Lists button. - -=cut - -sub ShelvesMax { - my $which= shift; - return SHELVES_POPUP_MAX if $which eq 'POPUP'; - return SHELVES_MGRPAGE_MAX if $which eq 'MGRPAGE'; - return SHELVES_COMBO_MAX if $which eq 'COMBO'; - return SHELVES_MASTHEAD_MAX if $which eq 'MASTHEAD'; - return SHELVES_MASTHEAD_MAX; -} - -sub GetShelfCount { - my ($owner, $category) = @_; - my @params; - # Find out how many shelves total meet the submitted criteria... - - my $dbh = C4::Context->dbh; - my $query = "SELECT count(*) FROM virtualshelves vs "; - if($category==1) { - $query.= qq{ - LEFT JOIN virtualshelfshares sh ON sh.shelfnumber=vs.shelfnumber - AND sh.borrowernumber=? - WHERE category=1 AND (vs.owner=? OR sh.borrowernumber=?) }; - @params= ($owner, $owner, $owner); - } - else { - $query.='WHERE category=2'; - @params= (); - } - my $sth = $dbh->prepare($query); - $sth->execute(@params); - my ($total)= $sth->fetchrow; - return $total; -} - -1; - -__END__ - -=head1 AUTHOR - -Koha Development Team - -=head1 SEE ALSO - -C4::Circulation::Circ2(3) - -=cut diff --git a/C4/VirtualShelves/Page.pm b/C4/VirtualShelves/Page.pm deleted file mode 100644 index 47efb14bc3..0000000000 --- a/C4/VirtualShelves/Page.pm +++ /dev/null @@ -1,564 +0,0 @@ -package C4::VirtualShelves::Page; - -# -# Copyright 2000-2002 Katipo Communications -# -# 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 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. -# -# You should have received a copy of the GNU General Public License -# along with Koha; if not, see . - -# perldoc at the end of the file, per convention. - -use strict; -use warnings; - -use CGI qw ( -utf8 ); -use Exporter; -use Data::Dumper; - -use C4::VirtualShelves qw/:DEFAULT ShelvesMax/; -use C4::Biblio; -use C4::Items; -use C4::Reserves; -use C4::Koha; -use C4::Auth qw/get_session/; -use C4::Members; -use C4::Output; -use C4::Dates qw/format_date/; -use C4::Tags qw(get_tags); -use C4::Csv; -use C4::XSLT; - -use Koha::Virtualshelves; - -use constant VIRTUALSHELVES_COUNT => 20; - -use vars qw($debug @EXPORT @ISA $VERSION); - -BEGIN { - $VERSION = 3.07.00.049; - @ISA = qw(Exporter); - @EXPORT = qw(&shelfpage); - $debug = $ENV{DEBUG} || 0; -} - -my @messages; -our %pages = ( - intranet => { redirect => '/cgi-bin/koha/virtualshelves/shelves.pl', }, - opac => { redirect => '/cgi-bin/koha/opac-shelves.pl', }, -); - -sub shelfpage { - my ( $type, $query, $template, $loggedinuser, $cookie ) = @_; - ( $pages{$type} ) or $type = 'opac'; - $query or die "No query"; - $template or die "No template"; - $template->param( - loggedinuser => $loggedinuser, - OpacAllowPublicListCreation => C4::Context->preference('OpacAllowPublicListCreation'), - ); - my $shelves; - my @paramsloop; - my $totitems; - my $shelfoff = ( $query->param('shelfoff') ? $query->param('shelfoff') : 1 ); - $template->{VARS}->{'shelfoff'} = $shelfoff; - my $itemoff = ( $query->param('itemoff') ? $query->param('itemoff') : 1 ); - my $displaymode = ( $query->param('display') ? $query->param('display') : 'publicshelves' ); - my ( $shelflimit, $shelfoffset, $shelveslimit, $shelvesoffset ); - my $marcflavour = C4::Context->preference("marcflavour"); - - unless ( $query->param('print') ) { - $shelflimit = ( $type eq 'opac' ? C4::Context->preference('OPACnumSearchResults') : C4::Context->preference('numSearchResults') ); - $shelflimit = $shelflimit || ShelvesMax('MGRPAGE'); - $shelflimit = undef if $query->param('rss'); - $shelfoffset = ( $itemoff - 1 ) * $shelflimit; # Sets the offset to begin retrieving items at - $shelveslimit = $shelflimit; # Limits number of shelves returned for a given query (row_count) - $shelvesoffset = ( $shelfoff - 1 ) * $shelflimit; # Sets the offset to begin retrieving shelves at (offset) - } - - # getting the Shelves list - my $category = ( ( $displaymode eq 'privateshelves' ) ? 1 : 2 ); - - my $shelflist; - if ( $category == 2 ) { - $shelflist = Koha::Virtualshelves->get_public_shelves({ limit => $shelveslimit, offset => $shelvesoffset }); - } else { - $shelflist = Koha::Virtualshelves->get_private_shelves({ limit => $shelveslimit, offset => $shelvesoffset, borrowernumber => $loggedinuser }); - } - my $totshelves = C4::VirtualShelves::GetShelfCount( $loggedinuser, $category ); - - my $op = $query->param('op'); - - # the format of this is unindented for ease of diff comparison to the old script - # Note: do not mistake the assignment statements below for comparisons! - if ( $query->param('modifyshelfcontents') ) { - my ( $shelfnumber, $barcode, $item, $biblio ); - if ( $shelfnumber = $query->param('viewshelf') ) { - #add to shelf - if($barcode = $query->param('addbarcode') ) { - if(ShelfPossibleAction( $loggedinuser, $shelfnumber, 'add')) { - $item = GetItem( 0, $barcode); - if (defined $item && $item->{'itemnumber'}) { - $biblio = GetBiblioFromItemNumber( $item->{'itemnumber'} ); - Koha::Virtualshelves->find( $shelfnumber )->add_biblio( $biblio->{biblionumber}, $loggedinuser ) - or push @paramsloop, { duplicatebiblio => $barcode }; - } - else { - push @paramsloop, { failgetitem => $barcode }; - } - } - else { - push @paramsloop, { nopermission => $shelfnumber }; - } - } - elsif(grep { /REM-(\d+)/ } $query->param) { - #remove item(s) from shelf - if(ShelfPossibleAction($loggedinuser, $shelfnumber, 'delete')) { - my @bib; - foreach($query->param) { - /REM-(\d+)/ or next; - push @bib, $1; #$1 is biblionumber - } - my $shelf = Koha::Virtualshelves->find( $shelfnumber ); - my $number_of_biblios_removed = $shelf->remove_biblios( { biblionumbers => \@bib, borrowernumber => $loggedinuser } ); - if( $number_of_biblios_removed == 0) { - push @paramsloop, {nothingdeleted => $shelfnumber}; - } - elsif( $number_of_biblios_removed < @bib ) { - push @paramsloop, {somedeleted => $shelfnumber}; - } - } - else { - push @paramsloop, { nopermission => $shelfnumber }; - } - } - } - else { - push @paramsloop, { noshelfnumber => 1 }; - } - } - - my $showadd = 1; - - # set the default tab, etc. (for OPAC) - my $shelf_type = ( $query->param('display') ? $query->param('display') : 'publicshelves' ); - if ( defined $shelf_type ) { - if ( $shelf_type eq 'privateshelves' ) { - $template->param( showprivateshelves => 1 ); - } elsif ( $shelf_type eq 'publicshelves' ) { - $template->param( showpublicshelves => 1 ); - $showadd = 0; - } else { - $debug and warn "Invalid 'display' param ($shelf_type)"; - } - } elsif ( $loggedinuser == -1 ) { - $template->param( showpublicshelves => 1 ); - } else { - $template->param( showprivateshelves => 1 ); - } - - my ( $okmanage, $okview ); - my $shelfnumber = $query->param('shelfnumber') || $query->param('viewshelf'); - if ($shelfnumber) { - $okmanage = ShelfPossibleAction( $loggedinuser, $shelfnumber, 'manage' ); - $okview = ShelfPossibleAction( $loggedinuser, $shelfnumber, 'view' ); - } - - my $delflag = 0; - - SWITCH: { - if ($op) { - #Saving modified shelf - if ( $op eq 'modifsave' ) { - unless ($okmanage) { - push @paramsloop, { nopermission => $shelfnumber }; - last SWITCH; - } - my $shelf = Koha::Virtualshelves->find( $shelfnumber ); - $shelf->shelfname($query->param('shelfname')); - $shelf->sortfield($query->param('sortfield')); - $shelf->allow_add($query->param('allow_add')); - $shelf->allow_delete_own($query->param('allow_delete_own')); - $shelf->allow_delete_other($query->param('allow_delete_other')); - if( my $category = $query->param('category')) { #optional - $shelf->category($category); - } - eval { $shelf->store }; - if ( $@ ) { - push @paramsloop, {modifyfailure => $shelf->{shelfname}}; - last SWITCH; - } - - if($displaymode eq "viewshelf"){ - print $query->redirect( $pages{$type}->{redirect} . "?viewshelf=$shelfnumber" ); - } elsif($displaymode eq "publicshelves"){ - print $query->redirect( $pages{$type}->{redirect} ); - } else { - print $query->redirect( $pages{$type}->{redirect} . "?display=privateshelves" ); - } - exit; - } - #Editing a shelf - elsif ( $op eq 'modif' ) { - my $shelf = Koha::Virtualshelves->find( $shelfnumber ); - my $member = GetMember( 'borrowernumber' => $shelf->owner ); - my $ownername = defined($member) ? $member->{firstname} . " " . $member->{surname} : ''; - $template->param( - edit => 1, - display => $displaymode, - shelfnumber => $shelf->shelfnumber, - shelfname => $shelf->shelfname, - owner => $shelf->owner, - ownername => $ownername, - "category".$shelf->category => 1, - category => $shelf->category, - sortfield => $shelf->sortfield, - allow_add => $shelf->allow_add, - allow_delete_own => $shelf->allow_delete_own, - allow_delete_other => $shelf->allow_delete_other, - ); - } - last SWITCH; - } - - #View a shelf - if ( $shelfnumber = $query->param('viewshelf') ) { - my $shelf = Koha::Virtualshelves->find( $shelfnumber ); - if (C4::Context->preference('TagsEnabled')) { - $template->param(TagsEnabled => 1); - foreach (qw(TagsShowOnList TagsInputOnList)) { - C4::Context->preference($_) and $template->param($_ => 1); - } - } - #check that the user can view the shelf - if ( ShelfPossibleAction( $loggedinuser, $shelfnumber, 'view' ) ) { - my $items; - my $tag_quantity; - my $sortfield = ( $shelf->sortfield ? $shelf->sortfield : 'title' ); - $sortfield = $query->param('sort') || $sortfield; ## Passed in sorting overrides default sorting - my $direction = $query->param('direction') || 'asc'; - $template->param( - sort => $sortfield, - direction => $direction, - ); - ( $items, $totitems ) = GetShelfContents( $shelfnumber, $shelflimit, $shelfoffset, $sortfield, $direction ); - - # get biblionumbers stored in the cart - # Note that it's not use at the intranet - my @cart_list; - my $cart_cookie = ( $type eq 'opac' ? "bib_list" : "intranet_bib_list" ); - if($query->cookie($cart_cookie)){ - my $cart_list = $query->cookie($cart_cookie); - @cart_list = split(/\//, $cart_list); - } - - my $borrower = GetMember( 'borrowernumber' => $loggedinuser ); - - for my $this_item (@$items) { - my $biblionumber = $this_item->{'biblionumber'}; - my $record = GetMarcBiblio($biblionumber); - if (C4::Context->preference("OPACXSLTResultsDisplay") && $type eq 'opac') { - $this_item->{XSLTBloc} = XSLTParse4Display($biblionumber, $record, "OPACXSLTResultsDisplay"); - } elsif (C4::Context->preference("XSLTResultsDisplay") && $type eq 'intranet') { - $this_item->{XSLTBloc} = XSLTParse4Display($biblionumber, $record, "XSLTResultsDisplay"); - } - - # the virtualshelfcontents table does not store these columns nor are they retrieved from the items - # and itemtypes tables, so I'm commenting them out for now to quiet the log -crn - #$this_item->{imageurl} = $imgdir."/".$itemtypes->{ $this_item->{itemtype} }->{'imageurl'}; - #$this_item->{'description'} = $itemtypes->{ $this_item->{itemtype} }->{'description'}; - $this_item->{'dateadded'} = format_date( $this_item->{'dateadded'} ); - $this_item->{'imageurl'} = getitemtypeinfo( $this_item->{'itemtype'}, $type )->{'imageurl'}; - $this_item->{'coins'} = GetCOinSBiblio( $record ); - $this_item->{'subtitle'} = GetRecordValue('subtitle', $record, GetFrameworkCode($this_item->{'biblionumber'})); - $this_item->{'normalized_upc'} = GetNormalizedUPC( $record,$marcflavour); - $this_item->{'normalized_ean'} = GetNormalizedEAN( $record,$marcflavour); - $this_item->{'normalized_oclc'} = GetNormalizedOCLCNumber($record,$marcflavour); - $this_item->{'normalized_isbn'} = GetNormalizedISBN(undef,$record,$marcflavour); - if(!defined($this_item->{'size'})) { $this_item->{'size'} = "" }; #TT has problems with size - # Getting items infos for location display - my @items_infos = &GetItemsLocationInfo( $this_item->{'biblionumber'}); - $this_item->{'itemsissued'} = CountItemsIssued( $this_item->{'biblionumber'} ); - $this_item->{'ITEM_RESULTS'} = \@items_infos; - if ( grep {$_ eq $biblionumber} @cart_list) { - $this_item->{'incart'} = 1; - } - - if (C4::Context->preference('TagsEnabled') and $tag_quantity = C4::Context->preference('TagsShowOnList')) { - $this_item->{'TagLoop'} = get_tags({ - biblionumber=>$this_item->{'biblionumber'}, approved=>1, 'sort'=>'-weight', - limit=>$tag_quantity - }); - } - - $this_item->{'allow_onshelf_holds'} = C4::Reserves::OnShelfHoldsAllowed($this_item, $borrower); - } - if($type eq 'intranet'){ - # Build drop-down list for 'Add To:' menu... - my ($totalref, $pubshelves, $barshelves)= - C4::VirtualShelves::GetSomeShelfNames($loggedinuser,'COMBO',1); - $template->param( - addbarshelves => $totalref->{bartotal}, - addbarshelvesloop => $barshelves, - addpubshelves => $totalref->{pubtotal}, - addpubshelvesloop => $pubshelves, - ); - } - push @paramsloop, { display => 'privateshelves' } if $shelf->category == 1; - $showadd = 1; - my $i = 0; - my $manageshelf = ShelfPossibleAction( $loggedinuser, $shelfnumber, 'manage' ); - my $can_delete_shelf = ShelfPossibleAction( $loggedinuser, $shelfnumber, 'delete_shelf' ); - $template->param( - shelfname => $shelf->shelfname, - shelfnumber => $shelfnumber, - viewshelf => $shelfnumber, - sortfield => $sortfield, - manageshelf => $manageshelf, - allowremovingitems => ShelfPossibleAction( $loggedinuser, $shelfnumber, 'delete'), - allowaddingitem => ShelfPossibleAction( $loggedinuser, $shelfnumber, 'add'), - allowdeletingshelf => $can_delete_shelf, - "category".$shelf->category => 1, - category => $shelf->category, - itemsloop => $items, - showprivateshelves => $shelf->category==1, - ); - } else { - push @paramsloop, { nopermission => $shelfnumber }; - } - last SWITCH; - } - - if ( $query->param('shelves') ) { - my $stay = 1; - - #Add a shelf - my $shelfname = $query->param('addshelf'); - - if ( $shelfname ) { - - # note: a user can always add a new shelf (except database administrator account) - my $shelf = eval { - Koha::Virtualshelf->new( - { - shelfname => $shelfname, - sortfield => $query->param('sortfield'), - category => $query->param('category'), - allow_add => $query->param('allow_add'), - allow_delete_own => $query->param('allow_delete_own'), - allow_delete_other => $query->param('allow_delete_other'), - owner => $query->param('owner'), - } - )->store; - }; - if ( $@ ) { - $showadd = 1; - push @messages, { type => 'error', code => ref($@) }; - } elsif ( not $shelf ) { - $showadd = 1; - push @messages, { type => 'error', 'error_on_insert' }; - } else { - print $query->redirect( $pages{$type}->{redirect} . "?viewshelf=$shelfnumber" ); - exit; - } - - $template->param( - shelfname => $shelfname, - ); - $stay = 1; - } - - #Deleting a shelf (asking for confirmation if it has entries) - foreach ( $query->param() ) { - /(DEL|REMSHR)-(\d+)/ or next; - $delflag = 1; - my $number = $2; - unless ( defined $shelflist->{$number} ) { - push( @paramsloop, { unrecognized => $number } ); - last; - } - #remove a share - if(/REMSHR/) { - my $shelf = Koha::Virtualshelves->find( $number ); - $shelf->delete_share( $loggedinuser ); - delete $shelflist->{$number} if exists $shelflist->{$number}; - $stay=0; - next; - } - - my $can_manage = ShelfPossibleAction( $loggedinuser, $number, 'manage' ); - my $can_delete = ShelfPossibleAction( $loggedinuser, $number, 'delete_shelf' ); - unless ( $can_manage or $can_delete ) { - push( @paramsloop, { nopermission => $shelfnumber } ); - last; - } - my $contents; - ( $contents, $totshelves ) = GetShelfContents( $number, $shelveslimit, $shelvesoffset ); - if ( $totshelves > 0 ) { - unless ( scalar grep { /^CONFIRM-$number$/ } $query->param() ) { - if ( defined $shelflist->{$number} ) { - push( @paramsloop, { need_confirm => $shelflist->{$number}->{shelfname}, count => $totshelves, single => ($totshelves eq 1 ? 1:0) } ); - $shelflist->{$number}->{confirm} = $number; - } - $stay = 0; - next; - } - } - my $name; - if ( defined $shelflist->{$number} ) { - $name = $shelflist->{$number}->{'shelfname'}; - delete $shelflist->{$number}; - } - unless( Koha::Virtualshelves->find($number)->delete ) { - push( @paramsloop, { delete_fail => $name } ); - last; - } - push( @paramsloop, { delete_ok => $name } ); - - $stay = 0; - } - $showadd = 1; - if ($stay){ - $template->param( shelves => 1 ); - $shelves = 1; - } - last SWITCH; - } - } # end of SWITCH block - - (@paramsloop) and $template->param( paramsloop => \@paramsloop ); - $showadd and $template->param( showadd => 1 ); - my @shelvesloop; - my @shelveslooppriv; - my $numberCanManage = 0; - - # rebuild shelflist in case a shelf has been added - unless ( $delflag ) { - if ( $category == 2 ) { - $shelflist = Koha::Virtualshelves->get_public_shelves({ limit => $shelveslimit, offset => $shelvesoffset }); - } else { - $shelflist = Koha::Virtualshelves->get_private_shelves({ limit => $shelveslimit, offset => $shelvesoffset, borrowernumber => $loggedinuser }); - } - } - - $totshelves = C4::VirtualShelves::GetShelfCount( $loggedinuser, $category ) unless $delflag; - foreach my $element ( sort { lc( $shelflist->{$a}->{'shelfname'} ) cmp lc( $shelflist->{$b}->{'shelfname'} ) } keys %$shelflist ) { - my %line; - $shelflist->{$element}->{shelf} = $element; - my $category = $shelflist->{$element}->{'category'}; - my $owner = $shelflist->{$element}->{'owner'}||0; - my $canmanage = ShelfPossibleAction( $loggedinuser, $element, 'manage' ); - my $candelete = ShelfPossibleAction( $loggedinuser, $element, 'delete_shelf' ); - $shelflist->{$element}->{"viewcategory$category"} = 1; - $shelflist->{$element}->{manageshelf} = $canmanage; - $shelflist->{$element}->{allowdeletingshelf} = $candelete; - if($canmanage || ($loggedinuser && $owner==$loggedinuser)) { - $shelflist->{$element}->{'mine'} = 1; - } - my $member = GetMember( 'borrowernumber' => $owner ); - $shelflist->{$element}->{ownername} = defined($member) ? $member->{firstname} . " " . $member->{surname} : ''; - $numberCanManage++ if $canmanage; # possibly outmoded - if ( $shelflist->{$element}->{'category'} eq '1' ) { - my $shelf = Koha::Virtualshelves->find( $element ); - $shelflist->{$element}->{shares} = $shelf->is_shared; - push( @shelveslooppriv, $shelflist->{$element} ); - } else { - push( @shelvesloop, $shelflist->{$element} ); - } - } - - my $url = $type eq 'opac' ? "/cgi-bin/koha/opac-shelves.pl" : "/cgi-bin/koha/virtualshelves/shelves.pl"; - my %qhash = (); - foreach (qw(display viewshelf sortfield sort direction)) { - $qhash{$_} = $query->param($_) if $query->param($_); - } - ( scalar keys %qhash ) and $url .= '?' . join '&', map { "$_=$qhash{$_}" } keys %qhash; - if ( $shelflimit ) { - if ( $shelfnumber && $totitems ) { - $template->param( pagination_bar => pagination_bar( $url, ( int( $totitems / $shelflimit ) ) + ( ( $totitems % $shelflimit ) > 0 ? 1 : 0 ), $itemoff, "itemoff" ) ); - } elsif ( $totshelves ) { - $template->param( - pagination_bar => pagination_bar( $url, ( int( $totshelves / $shelveslimit ) ) + ( ( $totshelves % $shelveslimit ) > 0 ? 1 : 0 ), $shelfoff, "shelfoff" ) ); - } - } - - $template->param( - shelveslooppriv => \@shelveslooppriv, - shelvesloop => \@shelvesloop, - shelvesloopall => [ ( @shelvesloop, @shelveslooppriv ) ], - numberCanManage => $numberCanManage, - "BiblioDefaultView" . C4::Context->preference("BiblioDefaultView") => 1, - csv_profiles => GetCsvProfilesLoop('marc') - ); - -#Next call updates the shelves for the Lists button. -#May not always be needed (when nothing changed), but doesn't take much. - my ($total, $pubshelves, $barshelves) = C4::VirtualShelves::GetSomeShelfNames($loggedinuser, 'MASTHEAD'); - $template->param( - barshelves => $total->{bartotal}, - barshelvesloop => $barshelves, - pubshelves => $total->{pubtotal}, - pubshelvesloop => $pubshelves, - messages => \@messages, - ); - - output_html_with_http_headers $query, $cookie, $template->output; -} - -1; -__END__ - -=head1 NAME - -VirtualShelves/Page.pm - -=head1 DESCRIPTION - -Module used for both OPAC and intranet pages. - -=head1 CGI PARAMETERS - -=over 4 - -=item C - -If this script has to modify the shelf content. - -=item C - -To know on which shelf to work. - -=item C - -=item C - - Op can be: - * modif: show the template allowing modification of the shelves; - * modifsave: save changes from modif mode. - -=item C - -Load template with 'viewshelves param' displaying the shelf's information. - -=item C - -If the param shelves == 1, then add or delete a shelf. - -=item C - -If the param shelves == 1, then addshelf is the name of the shelf to add. - -=back - -=cut diff --git a/basket/downloadcart.pl b/basket/downloadcart.pl index c8fe4b2bef..17e56175ac 100755 --- a/basket/downloadcart.pl +++ b/basket/downloadcart.pl @@ -27,7 +27,6 @@ use C4::Auth; use C4::Biblio; use C4::Items; use C4::Output; -use C4::VirtualShelves; use C4::Record; use C4::Ris; use C4::Csv; diff --git a/catalogue/detail.pl b/catalogue/detail.pl index 1989a7c212..acae4bc328 100755 --- a/catalogue/detail.pl +++ b/catalogue/detail.pl @@ -36,7 +36,6 @@ use C4::XISBN qw(get_xisbns get_biblionumber_from_isbn); use C4::External::Amazon; use C4::Search; # enabled_staff_search_views use C4::Tags qw(get_tags); -use C4::VirtualShelves; use C4::XSLT; use C4::Images; use Koha::DateUtils; diff --git a/catalogue/search.pl b/catalogue/search.pl index facb7f6763..e74ceca11d 100755 --- a/catalogue/search.pl +++ b/catalogue/search.pl @@ -147,7 +147,6 @@ use C4::Search; use C4::Languages qw(getLanguages); use C4::Koha; use C4::Members qw(GetMember); -use C4::VirtualShelves; use URI::Escape; use POSIX qw(ceil floor); use C4::Branch; # GetBranches diff --git a/opac/opac-addbybiblionumber.pl b/opac/opac-addbybiblionumber.pl index 9ca2a3abf9..b8ad33064c 100755 --- a/opac/opac-addbybiblionumber.pl +++ b/opac/opac-addbybiblionumber.pl @@ -24,7 +24,6 @@ use warnings; use CGI qw ( -utf8 ); use C4::Biblio; -use C4::VirtualShelves qw/:DEFAULT/; use C4::Output; use C4::Auth; diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl index e7a5626ed2..6d71bedd09 100755 --- a/opac/opac-detail.pl +++ b/opac/opac-detail.pl @@ -40,7 +40,6 @@ use C4::External::Syndetics qw(get_syndetics_index get_syndetics_summary get_syn use C4::Review; use C4::Ratings; use C4::Members; -use C4::VirtualShelves; use C4::XSLT; use C4::ShelfBrowser; use C4::Reserves; diff --git a/opac/opac-downloadcart.pl b/opac/opac-downloadcart.pl index f14eb9ee2c..c5574e34a0 100755 --- a/opac/opac-downloadcart.pl +++ b/opac/opac-downloadcart.pl @@ -27,7 +27,6 @@ use C4::Auth; use C4::Biblio; use C4::Items; use C4::Output; -use C4::VirtualShelves; use C4::Record; use C4::Ris; use C4::Csv; diff --git a/opac/opac-downloadshelf.pl b/opac/opac-downloadshelf.pl index 320b1612fd..94bdae1611 100755 --- a/opac/opac-downloadshelf.pl +++ b/opac/opac-downloadshelf.pl @@ -27,7 +27,6 @@ use C4::Auth; use C4::Biblio; use C4::Items; use C4::Output; -use C4::VirtualShelves; use C4::Record; use C4::Ris; use C4::Csv; diff --git a/opac/opac-sendshelf.pl b/opac/opac-sendshelf.pl index a1b61054b6..91ab4ada6a 100755 --- a/opac/opac-sendshelf.pl +++ b/opac/opac-sendshelf.pl @@ -31,7 +31,6 @@ use C4::Auth; use C4::Biblio; use C4::Items; use C4::Output; -use C4::VirtualShelves; use C4::Members; use Koha::Email; use Koha::Virtualshelves; diff --git a/opac/opac-shareshelf.pl b/opac/opac-shareshelf.pl index ceafb334c8..7bc07eefee 100755 --- a/opac/opac-shareshelf.pl +++ b/opac/opac-shareshelf.pl @@ -32,7 +32,6 @@ use C4::Context; use C4::Letters; use C4::Members (); use C4::Output; -use C4::VirtualShelves; use Koha::Virtualshelves; use Koha::Virtualshelfshares; diff --git a/opac/opac-shelves.pl b/opac/opac-shelves.pl index f7bd52a3c7..63dc402297 100755 --- a/opac/opac-shelves.pl +++ b/opac/opac-shelves.pl @@ -19,7 +19,6 @@ use Modern::Perl; use CGI qw ( -utf8 ); -use C4::VirtualShelves; use C4::Auth; use C4::Biblio; use C4::Koha; diff --git a/t/db_dependent/Utils/Datatables_Virtualshelves.t b/t/db_dependent/Utils/Datatables_Virtualshelves.t index ce56aaad96..0a8f0ab362 100644 --- a/t/db_dependent/Utils/Datatables_Virtualshelves.t +++ b/t/db_dependent/Utils/Datatables_Virtualshelves.t @@ -24,8 +24,6 @@ use C4::Context; use C4::Branch; use C4::Members; -use C4::VirtualShelves; - use Koha::Virtualshelf; use Koha::Virtualshelves; diff --git a/t/db_dependent/VirtualShelves_Page.t b/t/db_dependent/VirtualShelves_Page.t deleted file mode 100755 index 236d1476fa..0000000000 --- a/t/db_dependent/VirtualShelves_Page.t +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/perl -# -# This Koha test module is a stub! -# Add more tests here!!! - -use strict; -use warnings; - -use Test::More tests => 1; - -BEGIN { - use_ok('C4::VirtualShelves::Page'); -} - diff --git a/virtualshelves/addbybiblionumber.pl b/virtualshelves/addbybiblionumber.pl index 8690000d76..9772c6de48 100755 --- a/virtualshelves/addbybiblionumber.pl +++ b/virtualshelves/addbybiblionumber.pl @@ -64,7 +64,6 @@ use warnings; use CGI qw ( -utf8 ); use C4::Biblio; use C4::Output; -use C4::VirtualShelves qw/:DEFAULT/; use C4::Auth; use Koha::Virtualshelves; diff --git a/virtualshelves/downloadshelf.pl b/virtualshelves/downloadshelf.pl index 3d1b10df91..5a00694645 100755 --- a/virtualshelves/downloadshelf.pl +++ b/virtualshelves/downloadshelf.pl @@ -27,7 +27,6 @@ use C4::Auth; use C4::Biblio; use C4::Items; use C4::Output; -use C4::VirtualShelves; use C4::Record; use C4::Ris; use C4::Csv; diff --git a/virtualshelves/sendshelf.pl b/virtualshelves/sendshelf.pl index 0ef6e1ea68..9d10492100 100755 --- a/virtualshelves/sendshelf.pl +++ b/virtualshelves/sendshelf.pl @@ -31,7 +31,6 @@ use C4::Auth; use C4::Biblio; use C4::Items; use C4::Output; -use C4::VirtualShelves; use Koha::Email; use Koha::Virtualshelves; diff --git a/virtualshelves/shelves.pl b/virtualshelves/shelves.pl index 2af2015fe8..a6328ce8ed 100755 --- a/virtualshelves/shelves.pl +++ b/virtualshelves/shelves.pl @@ -19,7 +19,6 @@ use Modern::Perl; use CGI qw ( -utf8 ); -use C4::VirtualShelves; use C4::Auth; use C4::Biblio; use C4::Csv; -- 2.39.5