[Koha-cvs] koha adminbranches.pl koha-tmpl/intranet-tmpl/p...

[LAURIN arnaud]

CVSROOT:	/sources/koha
Module name:	koha
Changes by:	LAURIN arnaud <alaurin>	06/06/12 09:38:52

Modified files:
	admin          : branches.pl 
	koha-tmpl/intranet-tmpl/prog/en/admin: branches.tmpl 

Log message:
	bug fixing :
	
	   - Printer selection for add a new branch, is now working
	
	   - the branchname of librarian is not display automaticly if you add a new branch
	
	   - the printqueue is now displayed on branches infos page and edit branch page

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/admin/branches.pl?cvsroot=koha&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/branches.tmpl?cvsroot=koha&r1=1.2&r2=1.3

Patches:
Index: admin/branches.pl
===================================================================
RCS file: /sources/koha/koha/admin/branches.pl,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- admin/branches.pl	19 May 2006 09:52:54 -0000	1.32
+++ admin/branches.pl	12 Jun 2006 09:38:52 -0000	1.33
@@ -204,14 +204,14 @@
 			my $selected = 1 if $oldprinter eq $printers->{$thisprinter}->{'printqueue'};
 			my %row =(value => $thisprinter,
 					selected => $selected,
-					branchprinter => $printers->{$thisprinter}->{'printername'},
+					branchprinter => $printers->{$thisprinter}->{'printqueue'},
 			);
 		push @printerloop, \%row;
 		}
 		
 		$template->param(printerloop => \@printerloop );
 		$template->param(branchcode => $data->{'branchcode'});
-		$template->param(branchname => $data->{'branchname'});
+		$template->param(branch_name => $data->{'branchname'});
 		$template->param(branchaddress1 => $data->{'branchaddress1'});
 		$template->param(branchaddress2 => $data->{'branchaddress2'});
 		$template->param(branchaddress3 => $data->{'branchaddress3'});
@@ -220,17 +220,15 @@
 		$template->param(branchemail => $data->{'branchemail'});
 		$template->param(branchip => $data->{'branchip'});
     	}
-	else {
-# on add new branch mode, simple scrolling list
-		$CGIprinter=CGI::scrolling_list( -name     => 'branchprinter',
-		-id => 'branchprinter',
-		-values   => \@printerloop,
-		-size     => 1,
-		-multiple => 0 );	
-
+	else { #case of an add branch select printer
+		foreach my $thisprinter (keys %$printers) {
+			my %row =(value => $thisprinter,
+				branchprinter => $printers->{$thisprinter}->{'printqueue'},
+			);
+		push @printerloop, \%row;
+		}
+	$template->param(printerloop => \@printerloop );	
 	}
-#  sending the cgiprinter to the template
-# 		$template->param(printerloop => $CGIprinter);
 
     # make the checkboxs.....
     #

Index: koha-tmpl/intranet-tmpl/prog/en/admin/branches.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/branches.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- koha-tmpl/intranet-tmpl/prog/en/admin/branches.tmpl	19 May 2006 09:52:54 -0000	1.2
+++ koha-tmpl/intranet-tmpl/prog/en/admin/branches.tmpl	12 Jun 2006 09:38:52 -0000	1.3
@@ -25,7 +25,7 @@
 	</tr>
 	<tr>
 		<td>Name</td>
-		<td><input type="text" name="branchname" size="40" maxlength="80" value="<!-- TMPL_VAR name="branchname" escape="HTML" -->" />&nbsp;</td>
+		<td><input type="text" name="branchname" size="40" maxlength="80" value="<!-- TMPL_VAR name="branch_name" escape="HTML" -->" />&nbsp;</td>
 	</tr>
 <!-- TMPL_LOOP name="categoryloop" -->
 					<tr>