Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 13418: Clean C4::VirtualShelves::Page - Part 2

Browse source 
I don't understand at all the usefulness of $privshelflist and
$privtotshelves in C4::VirtualShelves::Page
They look useless.

If you deep in the git history, you will find
    commit 25eb36f21f
    Bug #2531 Cannot delete private shelf

I am not able to reproduce this issue after this patch

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
This commit is contained in:
Jonathan Druart 2014-12-05 13:40:00 +01:00 committed by Tomas Cohen Arazi
parent 926e97b9e9
commit 12eb3cb440
1 changed files with 11 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
C4/VirtualShelves/Page.pm
View file

@ -75,14 +75,6 @@ sub shelfpage {
my ( $shelflimit, $shelfoffset, $shelveslimit, $shelvesoffset );
my $marcflavour = C4::Context->preference("marcflavour");
# get biblionumbers stored in the cart
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);
}
$shelflimit = ( $type eq 'opac' ? C4::Context->preference('OPACnumSearchResults') : C4::Context->preference('numSearchResults') );
$shelflimit = $shelflimit || ShelvesMax('MGRPAGE');
$shelfoffset = ( $itemoff - 1 ) * $shelflimit; # Sets the offset to begin retrieving items at
@ -93,11 +85,6 @@ sub shelfpage {
my $shelflist = GetShelves( $category, $shelveslimit, $shelvesoffset, $loggedinuser );
my $totshelves = C4::VirtualShelves::GetShelfCount( $loggedinuser, $category );
#Get a list of private shelves for possible deletion. Only do this when we've defaulted to public shelves
my ( $privshelflist, $privtotshelves );
if ( $category == 2 ) {
( $privshelflist, $privtotshelves ) = GetShelves( 1, $shelveslimit, $shelvesoffset, $loggedinuser );
}
my $op = $query->param('op');
# the format of this is unindented for ease of diff comparison to the old script
@ -260,6 +247,16 @@ sub shelfpage {
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);
}
for my $this_item (@$items) {
my $biblionumber = $this_item->{'biblionumber'};
my $record = GetMarcBiblio($biblionumber);
@ -366,7 +363,7 @@ sub shelfpage {
/(DEL|REMSHR)-(\d+)/ or next;
$delflag = 1;
my $number = $2;
unless ( defined $shelflist->{$number} || defined $privshelflist->{$number} ) {
unless ( defined $shelflist->{$number} ) {
push( @paramsloop, { unrecognized => $number } );
last;
}
@ -374,7 +371,6 @@ sub shelfpage {
if(/REMSHR/) {
RemoveShare($loggedinuser, $number);
delete $shelflist->{$number} if exists $shelflist->{$number};
delete $privshelflist->{$number} if exists $privshelflist->{$number};
$stay=0;
next;
}
@ -390,9 +386,6 @@ sub shelfpage {
if ( defined $shelflist->{$number} ) {
push( @paramsloop, { need_confirm => $shelflist->{$number}->{shelfname}, count => $totshelves, single => ($totshelves eq 1 ? 1:0) } );
$shelflist->{$number}->{confirm} = $number;
} else {
push( @paramsloop, { need_confirm => $privshelflist->{$number}->{shelfname}, count => $totshelves } );
$privshelflist->{$number}->{confirm} = $number;
}
$stay = 0;
next;
@ -402,9 +395,6 @@ sub shelfpage {
if ( defined $shelflist->{$number} ) {
$name = $shelflist->{$number}->{'shelfname'};
delete $shelflist->{$number};
} else {
$name = $privshelflist->{$number}->{'shelfname'};
delete $privshelflist->{$number};
}
unless ( DelShelf($number) ) {
push( @paramsloop, { delete_fail => $name } );