use strict;
use warnings;
use CGI;
-use C4::VirtualShelves;
+use C4::VirtualShelves qw/:DEFAULT RefreshShelvesSummary/;
use C4::Biblio;
use C4::Items;
use C4::Koha;
my ($shelflimit, $shelfoffset, $shelveslimit, $shelvesoffset);
# FIXME: These limits should not be hardcoded...
$shelflimit = 20; # Limits number of items returned for a given query
- $shelfoffset = (($itemoff == 1) ? 0 : ($itemoff * 10)); # Sets the offset to begin retrieving items at
+ $shelfoffset = ($itemoff - 1) * 20; # Sets the offset to begin retrieving items at
$shelveslimit = 20; # Limits number of shelves returned for a given query (row_count)
- $shelvesoffset = (($shelfoff == 1) ? 0 : ($shelfoff * 10)); # Sets the offset to begin retrieving shelves at (offset)
+ $shelvesoffset = ($shelfoff - 1) * 20; # Sets the offset to begin retrieving shelves at (offset)
# getting the Shelves list
my $category = (($displaymode eq 'privateshelves') ? 1 : 2);
my ($shelflist, $totshelves) = GetShelves( $category, $shelveslimit, $shelvesoffset, $loggedinuser );
+ #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');
# my $imgdir = getitemtypeimagesrc();
# my $itemtypes = GetItemTypes();
#$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'})->{'imageurl'};
+ $this_item->{'coins'} = GetCOinSBiblio($this_item->{'biblionumber'});
}
+ push @paramsloop, {display => 'privateshelves'} if $category == 1;
$showadd = 1;
my $i = 0;
- foreach (grep {$i++ % 2} @$items) { # every other item
- $_->{toggle} = 1;
- }
my $manageshelf = ShelfPossibleAction( $loggedinuser, $shelfnumber, 'manage' );
$template->param(
- shelfname => $shelflist->{$shelfnumber}->{'shelfname'},
+ shelfname => $shelflist->{$shelfnumber}->{'shelfname'} || $privshelflist->{$shelfnumber}->{'shelfname'},
shelfnumber => $shelfnumber,
viewshelf => $shelfnumber,
manageshelf => $manageshelf,
/DEL-(\d+)/ or next;
$delflag = 1;
my $number = $1;
- unless (defined $shelflist->{$number}) {
+ unless (defined $shelflist->{$number} || defined $privshelflist->{$number}) {
push(@paramsloop, {unrecognized=>$number}); last;
}
unless (ShelfPossibleAction($loggedinuser, $number, 'manage')) {
($contents, $totshelves) = GetShelfContents($number, $shelveslimit, $shelvesoffset);
if (my $count = scalar @$contents){
unless (scalar grep {/^CONFIRM-$number$/} $query->param()) {
- push(@paramsloop, {need_confirm=>$shelflist->{$number}->{shelfname}, count=>$count});
- $shelflist->{$number}->{confirm} = $number;
+ if (defined $shelflist->{$number}) {
+ push(@paramsloop, {need_confirm=>$shelflist->{$number}->{shelfname}, count=>$count});
+ $shelflist->{$number}->{confirm} = $number;
+ } else {
+ push(@paramsloop, {need_confirm=>$privshelflist->{$number}->{shelfname}, count=>$count});
+ $privshelflist->{$number}->{confirm} = $number;
+ }
$stay = 0;
next;
}
}
- my $name = $shelflist->{$number}->{'shelfname'};
+ my $name;
+ 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}); last;
}
- delete $shelflist->{$number};
push(@paramsloop, {delete_ok=>$name});
# print $query->redirect($pages{$type}->{redirect}); exit;
$stay = 0;
$shelflist->{$element}->{ownername} = defined($member) ? $member->{firstname} . " " . $member->{surname} : '';
$numberCanManage++ if $canmanage; # possibly outmoded
if ($shelflist->{$element}->{'category'} eq '1') {
- (scalar(@shelveslooppriv) % 2) and $shelflist->{$element}->{toggle} = 1;
push (@shelveslooppriv, $shelflist->{$element});
} else {
- (scalar(@shelvesloop) % 2) and $shelflist->{$element}->{toggle} = 1;
push (@shelvesloop, $shelflist->{$element});
}
}
+
my $url = $type eq 'opac' ? "/cgi-bin/koha/opac-shelves.pl" : "/cgi-bin/koha/virtualshelves/shelves.pl";
-$url .= "?display=" . $query->param('display') if $query->param('display');
-$url .= "?viewshelf=" . $query->param('viewshelf') if $query->param('viewshelf');
+my %qhash = ();
+foreach (qw(display viewshelf)) {
+ $qhash{$_} = $query->param($_) if $query->param($_);
+}
+(scalar keys %qhash) and $url .= '?' . join '&', map {"$_=$qhash{$_}"} keys %qhash;
if ($query->param('viewshelf')) {
$template->param( {pagination_bar => pagination_bar($url, (int($totitems/$shelflimit)) + (($totitems % $shelflimit) > 0 ? 1 : 0), $itemoff, "itemoff")} );
} else {
$template->param( 'edit' ) ) {
$template->param(vseflag => 1);
}
-if ($template->param( 'shelves' ) or
+if ($template->param( 'shelves' ) or # note: this part looks duplicative, but is intentional
$template->param( 'edit' ) ) {
$template->param( seflag => 1);
}
my ($total, $pubshelves, $barshelves) = RefreshShelvesSummary($query->cookie("CGISESSID"),$loggedinuser,($loggedinuser == -1 ? 20 : 10));
if (defined $barshelves) {
- $template->param( barshelves => scalar (@{${@$barshelves}[0]}),
- barshelvesloop => ${@$barshelves}[0],
+ $template->param( barshelves => scalar (@{$barshelves->[0]}),
+ barshelvesloop => $barshelves->[0],
);
- $template->param( bartotal => $total->{'bartotal'}, ) if ($total->{'bartotal'} > scalar (@{${@$barshelves}[0]}));
+ $template->param( bartotal => $total->{'bartotal'}, ) if ($total->{'bartotal'} > scalar (@{$barshelves->[0]}));
}
if (defined $pubshelves) {
- $template->param( pubshelves => scalar (@{${@$pubshelves}[0]}),
- pubshelvesloop => ${@$pubshelves}[0],
+ $template->param( pubshelves => scalar (@{$pubshelves->[0]}),
+ pubshelvesloop => $pubshelves->[0],
);
- $template->param( pubtotal => $total->{'pubtotal'}, ) if ($total->{'pubtotal'} > scalar (@{${@$pubshelves}[0]}));
+ $template->param( pubtotal => $total->{'pubtotal'}, ) if ($total->{'pubtotal'} > scalar (@{$pubshelves->[0]}));
}
output_html_with_http_headers $query, $cookie, $template->output;
projects / koha.git / blobdiff