Fallout from removing Date.pm, two places still used it

[koha_fer] / C4 / VirtualShelves / Page.pm

diff --git a/C4/VirtualShelves/Page.pm b/C4/VirtualShelves/Page.pm
index fbfb4bf..17d9c55 100755 (executable)
--- a/C4/VirtualShelves/Page.pm
+++ b/C4/VirtualShelves/Page.pm
@@ -26,9 +26,11 @@ use CGI;
 use C4::VirtualShelves qw/:DEFAULT GetShelvesSummary/;
 use C4::Biblio;
 use C4::Items;
+use C4::Koha;
 use C4::Auth qw/get_session/;
 use C4::Members;
 use C4::Output;
+use C4::Dates qw/format_date/;
 use Exporter;
 
 use vars qw($debug @EXPORT @ISA $VERSION);
@@ -59,7 +61,9 @@ sub shelfpage ($$$$$) {
        # getting the Shelves list
        my $shelflist = GetShelves( $loggedinuser, 2 );
        my $op = $query->param('op');
-
+    my $imgdir = getitemtypeimagesrc();
+    my $itemtypes = GetItemTypes();
+    
 # 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!
 
@@ -116,19 +120,25 @@ SWITCH: {
                        last SWITCH;
                }
                if ( $op eq 'modifsave' ) {
-                       ModShelf(
-                               $shelfnumber, $query->param('shelfname'), $loggedinuser,
-                               $query->param('category'), $query->param('sortfield')
-                       );
+                       my $shelf = {
+                       'shelfname'             => $query->param('shelfname'),
+                               'category'              => $query->param('category'),
+                               'sortfield'             => $query->param('sortfield'),
+                       };
+                       $shelf->{'owner'} = $loggedinuser if $type eq 'intranet';       #we only overwrite the list owner if &ModShelf was called from the staff client
+
+                       ModShelf( $shelfnumber, $shelf );
                        $shelflist = GetShelves( $loggedinuser, 2 );    # refresh after mods
+               
                } elsif ( $op eq 'modif' ) {
-                       my ( $shelfnumber2, $shelfname, $owner, $category, $sortfield ) =GetShelf( $query->param('shelfnumber') );
+                       my ( $shelfnumber2, $shelfname, $owner, $category, $sortfield ) =GetShelf( $shelfnumber );
                        $template->param(
                                edit                => 1,
                                shelfnumber         => $shelfnumber2,
                                shelfname           => $shelfname,
                                owner               => $owner,
-                               "category$category" => 1,
+                               "category$category"     => 1,
+                               category                        => $category,
                                "sort_$sortfield"   => 1,
                        );
                }
@@ -136,8 +146,13 @@ SWITCH: {
        }
     if ($shelfnumber = $query->param('viewshelf') ) {
         #check that the user can view the shelf
-        if ( ShelfPossibleAction( $loggedinuser, $shelfnumber, 'view' ) ) {
-            my $items = GetShelfContents($shelfnumber);
+               if ( ShelfPossibleAction( $loggedinuser, $shelfnumber, 'view' ) ) {
+                       my $items = GetShelfContents($shelfnumber);
+                       for my $this_item (@$items) {
+                               $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'});
+                       }
                        $showadd = 1;
                        my $i = 0;
                        foreach (grep {$i++ % 2} @$items) {     # every other item
@@ -145,14 +160,14 @@ SWITCH: {
                        }
                        # my $manageshelf = &ShelfPossibleAction( $loggedinuser, $shelfnumber, 'manage' );
                        # ($manageshelf) and $showadd = 1;
-            $template->param(
-                shelfname   => $shelflist->{$shelfnumber}->{'shelfname'},
-                shelfnumber => $shelfnumber,
-                viewshelf   => $shelfnumber,
-                manageshelf => &ShelfPossibleAction( $loggedinuser, $shelfnumber, 'manage' ),
-                itemsloop => $items,
-            );
-        } else { push @paramsloop, {nopermission=>$shelfnumber}; }
+                       $template->param(
+                               shelfname   => $shelflist->{$shelfnumber}->{'shelfname'},
+                               shelfnumber => $shelfnumber,
+                               viewshelf   => $shelfnumber,
+                               manageshelf => &ShelfPossibleAction( $loggedinuser, $shelfnumber, 'manage' ),
+                               itemsloop => $items,
+                       );
+               } else { push @paramsloop, {nopermission=>$shelfnumber} };
         last SWITCH;
     }
     if ( $query->param('shelves') ) {
@@ -188,6 +203,7 @@ SWITCH: {
                                unless (scalar grep {/^CONFIRM-$number$/} $query->param()) {
                                        push(@paramsloop, {need_confirm=>$shelflist->{$number}->{shelfname}, count=>$count});
                                        $shelflist->{$number}->{confirm} = $number;
+                                       $stay = 0;
                                        next;
                                }
                        } 
@@ -226,7 +242,7 @@ foreach my $element (sort { lc($shelflist->{$a}->{'shelfname'}) cmp lc($shelflis
                $shelflist->{$element}->{'mine'} = 1;
        } 
        my $member = GetMember($owner,'borrowernumber');
-       $shelflist->{$element}->{ownername} = $member->{firstname} . " " . $member->{surname};
+       $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;
@@ -256,10 +272,12 @@ if ($template->param( 'shelves' ) or
 
 my $sessionID = $query->cookie("CGISESSID") ;
 my $session = get_session($sessionID);
-my $shelves = GetShelvesSummary($loggedinuser, 2, 10);
-$session->param('shelves', $shelves);
-$template->param( barshelves     => scalar (@$shelves));
-$template->param( barshelvesloop => $shelves);
+my $barshelves = GetShelvesSummary($loggedinuser, 2, 10);
+if (defined($barshelves)) {
+       $session->param('barshelves', $barshelves);
+       $template->param( barshelves     => scalar (@$barshelves));
+       $template->param( barshelvesloop => $barshelves);
+}
 
 output_html_with_http_headers $query, $cookie, $template->output;
 }