From e2cc76724332cbbed64e0c8c1e1782150560e8de Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Fri, 9 Sep 2005 10:04:55 +0000
Subject: [PATCH] porting 22 fixes to head

---
 koha-tmpl/intranet-tmpl/default/en/members/member.tmpl | 8 ++++----
 members/member.pl                                      | 1 +
 members/memberentry.pl                                 | 8 ++++++++
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl
index 3fefd1a1e9..c257360452 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl
@@ -23,8 +23,8 @@
 		<tr>
 			<th>&nbsp;</th>
 			<th>Card</th>
-			<th>Surname</th>
-			<th>Firstname</th>
+			<th>Name</th>
+			<th>Branch</th>
 			<th>Category</th>
 			<th>Address</th>
 			<th>OD/Issues</th>
@@ -39,8 +39,8 @@
 			<!-- /TMPL_IF -->
 				<td><!-- TMPL_VAR NAME="count" --></td>
 				<td><!-- TMPL_VAR NAME="cardnumber" --></td>
-				<td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" --></a></td>
-				<td><!-- TMPL_VAR NAME="firstname" --></a></td>
+				<td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a></td>
+				<td><!-- TMPL_VAR name="branchcode" --></td>
 				<td><!-- TMPL_VAR NAME="categorycode" --></td>
 				<td><!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME="city" --></td>
 				<td><!-- TMPL_VAR NAME="odissue" --></td>
diff --git a/members/member.pl b/members/member.pl
index 45948e2355..e01b4bf7c4 100755
--- a/members/member.pl
+++ b/members/member.pl
@@ -97,6 +97,7 @@ for (my $i=0; $i < $count; $i++){
         categorycode => $results->[$i]{'categorycode'},
         streetaddress => $results->[$i]{'streetaddress'},
         city => $results->[$i]{'city'},
+        branchcode => $results->[$i]{'branchcode'},
         odissue => "$od/$issue",
         fines => $fines,
         borrowernotes => $results->[$i]{'borrowernotes'});
diff --git a/members/memberentry.pl b/members/memberentry.pl
index 3fdae88bec..7f27125272 100755
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -158,6 +158,14 @@ if ($delete){
 	} else {
 		$data=borrdata('',$borrowernumber);
 	}
+	if (C4::Context->preference("IndependantBranches")) {
+		my $userenv = C4::Context->userenv;
+		if ($userenv->{flags} != 1 && $data->{branchcode}){
+			unless ($userenv->{branch} eq $data->{'branchcode'}){
+				print $input->redirect("/cgi-bin/koha/members/members-home.pl");
+			}
+		}
+	}
 	if ($actionType eq 'Add'){
 		$template->param( updtype => 'I');
 	} else {
-- 
2.11.0