Bug 3347: Inconsistencies with public and private list tables in opac-shelves.tmpl.

[koha.git] / C4 / VirtualShelves / Page.pm

diff --git a/C4/VirtualShelves/Page.pm b/C4/VirtualShelves/Page.pm
old mode 100755 (executable)
new mode 100644 (file)
index bcfd3af..99d1f5d
--- a/C4/VirtualShelves/Page.pm
+++ b/C4/VirtualShelves/Page.pm
@@ -72,6 +72,11 @@ sub shelfpage ($$$$$) {
        # 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();
@@ -172,15 +177,15 @@ SWITCH: {
                                #$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,
@@ -213,7 +218,7 @@ SWITCH: {
                        /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')) {
@@ -223,17 +228,28 @@ SWITCH: {
                        ($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;
@@ -267,16 +283,18 @@ foreach my $element (sort { lc($shelflist->{$a}->{'shelfname'}) cmp lc($shelflis
        $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 {
@@ -294,7 +312,7 @@ if ($template->param('viewshelf') or
        $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);
 }