Bug 12159: Fix getting extended patron attributes for circ-menu

[koha.git] / Koha / Patron / Attributes.pm

diff --git a/Koha/Patron/Attributes.pm b/Koha/Patron/Attributes.pm
index 4264e06..1bbd35b 100644 (file)
--- a/Koha/Patron/Attributes.pm
+++ b/Koha/Patron/Attributes.pm
@@ -31,6 +31,38 @@ Koha::Patron::Attributes - Koha Patron Attributes Object set class
 
 =cut
 
+=head3 search
+
+my $attributes-> Koha::Patron::Attributes->search( $params );
+
+=cut
+
+sub search {
+    my ( $self, $params, $attributes ) = @_;
+
+    my $branchcode = $params->{branchcode};
+    delete( $params->{branchcode} );
+
+    my $or =
+        $branchcode
+        ? {
+            '-or' => [
+                'borrower_attribute_types_branches.b_branchcode' => undef,
+                'borrower_attribute_types_branches.b_branchcode' => $branchcode,
+            ]
+        } : {};
+
+    my $join =
+        $branchcode
+        ? {
+            join => {
+                'borrower_attribute_types' => 'borrower_attribute_types_branches'
+            },
+        } : {};
+    $attributes //= {};
+    return $self->SUPER::search( { %$params, %$or }, { %$attributes, %$join } );
+}
+
 =head3 _type
 
 =cut