@@ -, +, @@
---
Koha/Clubs.pm | 14 +-------------
Koha/Patron.pm | 4 ++--
.../prog/en/modules/circ/circulation.tt | 4 ++--
.../prog/en/modules/members/moremember.tt | 4 ++--
.../opac-tmpl/bootstrap/en/modules/opac-user.tt | 4 ++--
5 files changed, 9 insertions(+), 21 deletions(-)
--- a/Koha/Clubs.pm
+++ a/Koha/Clubs.pm
@@ -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
--- a/Koha/Patron.pm
+++ a/Koha/Patron.pm
@@ -1355,7 +1355,7 @@ sub first_valid_email_address {
=cut
sub get_club_enrollments {
- my ( $self, $return_scalar ) = @_;
+ my ( $self ) = @_;
return Koha::Club::Enrollments->search( { borrowernumber => $self->borrowernumber(), date_canceled => undef } );
}
@@ -1365,7 +1365,7 @@ sub get_club_enrollments {
=cut
sub get_enrollable_clubs {
- my ( $self, $is_enrollable_from_opac, $return_scalar ) = @_;
+ my ( $self, $is_enrollable_from_opac ) = @_;
my $params;
$params->{is_enrollable_from_opac} = $is_enrollable_from_opac
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -805,8 +805,8 @@
[% debarments.count | html %] Restrictions
- [% SET enrollments = patron.get_club_enrollments(1) %]
- [% SET enrollable = patron.get_enrollable_clubs(0,1) %]
+ [% SET enrollments = patron.get_club_enrollments %]
+ [% SET enrollable = patron.get_enrollable_clubs(0) %]
[% IF CAN_user_clubs && ( enrollable.count || enrollments.count ) %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -732,8 +732,8 @@
[% debarments.size | html %] Restrictions
- [% SET enrollments = patron.get_club_enrollments(1) %]
- [% SET enrollable = patron.get_enrollable_clubs(0,1) %]
+ [% SET enrollments = patron.get_club_enrollments %]
+ [% SET enrollable = patron.get_enrollable_clubs(0) %]
[% IF CAN_user_clubs && ( enrollable.count || enrollments.count ) %]
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
+++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
@@ -10,8 +10,8 @@
[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
-[% SET borrower_club_enrollments = logged_in_user.get_club_enrollments(1) %]
-[% SET borrower_enrollable_clubs = logged_in_user.get_enrollable_clubs(1,1) %]
+[% SET borrower_club_enrollments = logged_in_user.get_club_enrollments %]
+[% SET borrower_enrollable_clubs = logged_in_user.get_enrollable_clubs(1) %]
[% INCLUDE 'doc-head-open.inc' %]
Your library home › [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog
--