Bug 12495 - Include streetnumber in hold alert address

[koha_fer] / members / members-home.pl

diff --git a/members/members-home.pl b/members/members-home.pl
index 1d8f1e5..584c387 100755 (executable)
--- a/members/members-home.pl
+++ b/members/members-home.pl
@@ -30,7 +30,6 @@ use Koha::Borrower::Modifications;
 
 my $query = new CGI;
 my $branch = $query->param('branchcode');
-my $template_name;
 
 $branch = q{} unless defined $branch;
 
@@ -45,12 +44,26 @@ my ($template, $loggedinuser, $cookie)
 
 my $branches = GetBranches;
 my @branchloop;
-foreach (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %{$branches}) {
+if ( C4::Branch::onlymine ) {
+    my $userenv = C4::Context->userenv;
+    my $branch = C4::Branch::GetBranchDetail( $userenv->{'branch'} );
     push @branchloop, {
-        value      => $_,
-        selected   => ($branches->{$_}->{branchcode} eq $branch),
-        branchname => $branches->{$_}->{branchname},
-    };
+        value => $branch->{branchcode},
+        branchcode => $branch->{branchcode},
+        branchname => $branch->{branchname},
+        selected => 1
+    }
+} else {
+    foreach (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %{$branches}) {
+        my $selected = 0;
+        $selected = 1 if $branch and $branch eq $_;
+        push @branchloop, {
+            value => $_,
+            branchcode => $_,
+            branchname => $branches->{$_}->{branchname},
+            selected => $selected
+        };
+    }
 }
 
 my @categories;
@@ -86,6 +99,10 @@ $template->param(
         no_add => $no_add,
         pending_borrower_modifications => $pending_borrower_modifications,
             );
-$template->param( 'alphabet' => C4::Context->preference('alphabet') || join ' ', 'A' .. 'Z' );
+
+$template->param(
+    alphabet => C4::Context->preference('alphabet') || join (' ', 'A' .. 'Z'),
+    PatronsPerPage => C4::Context->preference("PatronsPerPage") || 20,
+);
 
 output_html_with_http_headers $query, $cookie, $template->output;