Bug 15108: OAI-PMH provider improvements

[srvgit] / Koha / Clubs.pm

diff --git a/Koha/Clubs.pm b/Koha/Clubs.pm
index a553314..7d62d22 100644 (file)
--- a/Koha/Clubs.pm
+++ b/Koha/Clubs.pm
@@ -57,7 +57,10 @@ sub get_enrollable {
     }
 
     # Only clubs with no end date or an end date in the future can be enrolled in
-    $params->{'-or'} = [ date_end => { '>=' => \'CURRENT_DATE()' }, date_end => undef ];
+    $params->{'-and'} = [
+        -or => [ date_end => { '>=' => \'CURRENT_DATE()' }, date_end => undef],
+        -or => [ 'me.branchcode' => $borrower->branchcode, 'me.branchcode' => undef ]
+    ];
 
     my $rs = $self->_resultset()->search( $params, { prefetch => 'club_template' } );