[Koha-cvs] CVS: koha/bookshelves shelves.pl,1.4,1.5

[Paul POULAIN]

Update of /cvsroot/koha/koha/bookshelves
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7514/bookshelves

Modified Files:
	shelves.pl 
Log Message:
adding bookshelf features :
* create bookshelf on the fly
* modify a bookshelf name & status

Index: shelves.pl
===================================================================
RCS file: /cvsroot/koha/koha/bookshelves/shelves.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** shelves.pl	15 Dec 2004 17:28:23 -0000	1.4
--- shelves.pl	16 Dec 2004 11:30:57 -0000	1.5
***************
*** 67,73 ****
  					circbackgroundcolor => $circbackgroundcolor });
  SWITCH: {
! 	if ($query->param('op') eq 'modif') {  editshelf($query->param('shelf')); last SWITCH;}
! 	if ($query->param('viewshelf')) {  viewshelf($query->param('viewshelf')); last SWITCH;}
! 	if ($query->param('shelves')) {  shelves(); last SWITCH;}
  }
  
--- 67,91 ----
  					circbackgroundcolor => $circbackgroundcolor });
  SWITCH: {
! 	if ($query->param('op') eq 'modifsave') {
! 		ModifShelf($query->param('shelfnumber'),$query->param('shelfname'),$loggedinuser,$query->param('category'));
! 		last SWITCH;
! 	}
! 	if ($query->param('op') eq 'modif') {
! 		my ($shelfnumber,$shelfname,$owner,$category) = GetShelf($query->param('shelf'));
! 		$template->param(edit => 1,
! 						shelfnumber => $shelfnumber,
! 						shelfname => $shelfname,
! 						"category$category" => 1);
! # 		editshelf($query->param('shelf'));
! 		last SWITCH;
! 	}
! 	if ($query->param('viewshelf')) {
! 		viewshelf($query->param('viewshelf'));
! 		last SWITCH;
! 	}
! 	if ($query->param('shelves')) {
! 		shelves();
! 		last SWITCH;
! 	}
  }
  
***************
*** 82,88 ****
--- 100,109 ----
  		$line{'shelf'}=$element;
  		$line{'shelfname'}=$shelflist->{$element}->{'shelfname'};
+ 		$line{"category".$shelflist->{$element}->{'category'}} = 1;
  		$line{'mine'} = 1 if $shelflist->{$element}->{'owner'} eq $loggedinuser;
  		$line{'shelfbookcount'}=$shelflist->{$element}->{'count'};
  		$line{'canmanage'} = ShelfPossibleAction($loggedinuser,$element,'manage');
+ 		$line{'firstname'}=$shelflist->{$element}->{'firstname'} unless $shelflist->{$element}->{'owner'} eq $loggedinuser;
+ 		$line{'surname'}=$shelflist->{$element}->{'surname'} unless $shelflist->{$element}->{'owner'} eq $loggedinuser;
  ;
  		push (@shelvesloop, \%line);
***************
*** 92,103 ****
  output_html_with_http_headers $query, $cookie, $template->output;
  
! sub editshelf {
! 	my ($shelfnumber) = @_;
! 	my ($shelfnumber,$shelfname,$owner,$category) = GetShelf($shelfnumber);
! 	warn "($shelfnumber,$shelfname,$owner,$category)";
! 	$template->param(edit => 1,
! 					shelfname => $shelfname,
! 					"category$category" => 1);
! }
  sub shelves {
  	if (my $newshelf=$query->param('addshelf')) {
--- 113,124 ----
  output_html_with_http_headers $query, $cookie, $template->output;
  
! # sub editshelf {
! # 	my ($shelfnumber) = @_;
! # 	my ($shelfnumber,$shelfname,$owner,$category) = GetShelf($shelfnumber);
! # 	$template->param(edit => 1,
! # 					shelfnumber => $shelfnumber,
! # 					shelfname => $shelfname,
! # 					"category$category" => 1);
! # }
  sub shelves {
  	if (my $newshelf=$query->param('addshelf')) {
***************
*** 168,171 ****
--- 189,197 ----
  #
  # $Log$
+ # Revision 1.5  2004/12/16 11:30:57  tipaul
+ # adding bookshelf features :
+ # * create bookshelf on the fly
+ # * modify a bookshelf name & status
+ #
  # Revision 1.4  2004/12/15 17:28:23  tipaul
  # adding bookshelf features :