From 30a1ba86eb3867d1554a1cb872f6c576d8338282 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 14 Mar 2013 10:29:04 +0100 Subject: [PATCH] Bug 9811: Take into account of Independent branches If the syspref IndependentBranches is ON, the user can only request on it own branch. Try with IndependentBranches ON and OFF --- C4/Utils/DataTables/Members.pm | 9 +++++++ .../prog/en/includes/patron-search.inc | 10 ++++--- .../prog/en/modules/members/member.tt | 4 ++- members/member.pl | 28 ++++++++++++++------ members/members-home.pl | 21 +++++++++++---- 5 files changed, 55 insertions(+), 17 deletions(-) diff --git a/C4/Utils/DataTables/Members.pm b/C4/Utils/DataTables/Members.pm index c51e3f8..93c19dd 100644 --- a/C4/Utils/DataTables/Members.pm +++ b/C4/Utils/DataTables/Members.pm @@ -1,5 +1,6 @@ package C4::Utils::DataTables::Members; +use C4::Branch qw/onlymine/; use C4::Context; use C4::Members qw/GetMemberIssuesAndFines/; use C4::Utils::DataTables; @@ -17,6 +18,14 @@ sub search { my ($iTotalRecords, $iTotalDisplayRecords); + # If branches are independant and user is not superlibrarian + # The search has to be only on the user branch + if ( C4::Branch::onlymine ) { + my $userenv = C4::Context->userenv; + $branchcode = $userenv->{'branch'}; + + } + my $dbh = C4::Context->dbh; my $select = "SELECT SQL_CALC_FOUND_ROWS borrowers.borrowernumber, borrowers.surname, borrowers.firstname, borrowers.address, diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc index 15d622e..7ddc3a9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc @@ -46,9 +46,13 @@ - [% IF ( branchloop ) %] -

+ [% IF branchloop.size != 1 %] + + [% END %] + [% FOREACH branchloo IN branchloop %] [% IF ( branchloo.selected ) %] [% ELSE %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt index ab3b3a1..a1caf23 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt @@ -294,7 +294,9 @@