[Koha-cvs] koha/opac opac-shelves.pl [rel_3_0]

[Antoine Farnault]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	Antoine Farnault <toins>	06/12/14 16:04:25

Modified files:
	opac           : opac-shelves.pl 

Log message:
	sync with intranet.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-shelves.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.8.2.5&r2=1.8.2.6

Patches:
Index: opac-shelves.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-shelves.pl,v
retrieving revision 1.8.2.5
retrieving revision 1.8.2.6
diff -u -b -r1.8.2.5 -r1.8.2.6
--- opac-shelves.pl	11 Dec 2006 17:10:06 -0000	1.8.2.5
+++ opac-shelves.pl	14 Dec 2006 16:04:25 -0000	1.8.2.6
@@ -18,7 +18,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: opac-shelves.pl,v 1.8.2.5 2006/12/11 17:10:06 toins Exp $
+# $Id: opac-shelves.pl,v 1.8.2.6 2006/12/14 16:04:25 toins Exp $
 
 =head1 NAME
 
@@ -125,11 +125,11 @@
         last SWITCH;
     }
     if ( $query->param('viewshelf') ) {
-        viewshelf( $query->param('viewshelf') );
+        viewshelf( $query->param('viewshelf'),$template );
         last SWITCH;
     }
     if ( $query->param('shelves') ) {
-        shelves();
+        shelves($template);
         last SWITCH;
     }
 }
@@ -168,6 +168,7 @@
 output_html_with_http_headers $query, $cookie, $template->output;
 
 sub shelves {
+    my $innertemplate = shift;
     if ( my $newshelf = $query->param('addshelf') ) {
         my  $shelfnumber = AddShelf(
             $newshelf,
@@ -176,7 +177,7 @@
         );
 
         if ( $shelfnumber == -1 ) {    #shelf already exists.
-            $template->param(
+            $innertemplate->param(
                 {
                     shelfnumber => $shelfnumber,
                     already     => 1
@@ -199,7 +200,7 @@
         #if the shelf is not deleted, %line points on null
         push( @paramsloop, \%line );
     }
-    $template->param( paramsloop => \@paramsloop );
+    $innertemplate->param( paramsloop => \@paramsloop );
     my ($shelflist) = GetShelves( $loggedinuser, 2 );
     my $color = '';
     my @shelvesloop;
@@ -212,7 +213,7 @@
         $line{'shelfbookcount'} = $shelflist->{$element}->{'count'};
         push( @shelvesloop, \%line );
     }
-    $template->param(
+    $innertemplate->param(
         shelvesloop => \@shelvesloop,
         shelves     => 1,
     );
@@ -220,7 +221,7 @@
 
 sub viewshelf {
     my $shelfnumber = shift;
-
+    my $innertemplate = shift;
     #check that the user can view the shelf
     return
       unless ( ShelfPossibleAction( $loggedinuser, $shelfnumber, 'view' ) );
@@ -233,7 +234,7 @@
         $item->{'toggle'} = $color;
         push( @itemsloop, $item );
     }
-    $template->param(
+    $innertemplate->param(
         itemsloop   => \@itemsloop,
         shelfname   => $shelflist->{$shelfnumber}->{'shelfname'},
         shelfnumber => $shelfnumber,
@@ -245,6 +246,9 @@
 
 #
 # $Log: opac-shelves.pl,v $
+# Revision 1.8.2.6  2006/12/14 16:04:25  toins
+# sync with intranet.
+#
 # Revision 1.8.2.5  2006/12/11 17:10:06  toins
 # fixing some bugs on bookshelves.
 #