Bug 32030: Link agreements to a package

[srvgit] / Koha / Clubs.pm

diff --git a/Koha/Clubs.pm b/Koha/Clubs.pm
index 5b89a23..2f60648 100644 (file)
--- a/Koha/Clubs.pm
+++ b/Koha/Clubs.pm
@@ -50,7 +50,7 @@ sub get_enrollable {
     my $borrower = $params->{borrower};
     if ($borrower) {
         delete( $params->{borrower} );
-        my @enrollments = $borrower->get_club_enrollments();
+        my @enrollments = $borrower->get_club_enrollments->as_list;
         if (@enrollments) {
             $params->{'me.id'} = { -not_in => [ map { $_->club()->id() } @enrollments ] };
         }
@@ -70,19 +70,7 @@ sub get_enrollable {
         ]
     ];
 
-    my $rs = $self->_resultset()->search( $params, { prefetch => 'club_template' } );
-
-    if (wantarray) {
-        my $class = ref($self) ? ref($self) : $self;
-
-        return $class->_wrap( $rs->all() );
-
-    }
-    else {
-        my $class = ref($self) ? ref($self) : $self;
-
-        return $class->_new_from_dbic($rs);
-    }
+    return $self->search( $params, { prefetch => 'club_template' } );
 }
 
 =head3 filter_out_empty