From 9d7312370bd2cdefa7a0d365e052094f6f0ea591 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Thu, 23 Feb 2017 11:51:13 +0000 Subject: [PATCH] Bug 12461 - Use snake case --- Koha/Clubs.pm | 6 +++--- Koha/Patron.pm | 22 +++++++++++----------- clubs/patron-clubs-tab.pl | 4 ++-- .../prog/en/modules/circ/circulation.tt | 4 ++-- .../prog/en/modules/members/moremember.tt | 4 ++-- .../opac-tmpl/bootstrap/en/modules/opac-user.tt | 6 +++--- opac/clubs/clubs-tab.pl | 4 ++-- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Koha/Clubs.pm b/Koha/Clubs.pm index b5f5e98..fff88d8 100644 --- a/Koha/Clubs.pm +++ b/Koha/Clubs.pm @@ -39,18 +39,18 @@ This object represents a collection of clubs a patron may enroll in. =cut -=head3 GetEnrollable +=head3 get_enrollable =cut -sub GetEnrollable { +sub get_enrollable { my ( $self, $params ) = @_; # We need to filter out all the already enrolled in clubs my $borrower = $params->{borrower}; if ($borrower) { delete( $params->{borrower} ); - my @enrollments = $borrower->GetClubEnrollments(); + my @enrollments = $borrower->get_club_enrollments(); if (@enrollments) { $params->{'me.id'} = { -not_in => [ map { $_->club()->id() } @enrollments ] }; } diff --git a/Koha/Patron.pm b/Koha/Patron.pm index 273dd05..701cb6b 100644 --- a/Koha/Patron.pm +++ b/Koha/Patron.pm @@ -595,33 +595,33 @@ sub FirstValidEmailAddress { return $self->email() || $self->emailpro() || $self->b_email() || q{}; } -=head3 GetClubEnrollments +=head3 get_club_enrollments =cut -sub GetClubEnrollments { +sub get_club_enrollments { my ($self) = @_; return Koha::Club::Enrollments->search( { borrowernumber => $self->borrowernumber(), date_canceled => undef } ); } -=head3 GetClubEnrollmentsCount +=head3 get_club_enrollments_count =cut -sub GetClubEnrollmentsCount { +sub get_club_enrollments_count { my ($self) = @_; - my $e = $self->GetClubEnrollments(); + my $e = $self->get_club_enrollments(); return $e->count(); } -=head3 GetEnrollableClubs +=head3 get_enrollable_clubs =cut -sub GetEnrollableClubs { +sub get_enrollable_clubs { my ( $self, $is_enrollable_from_opac ) = @_; my $params; @@ -631,17 +631,17 @@ sub GetEnrollableClubs { $params->{borrower} = $self; - return Koha::Clubs->GetEnrollable($params); + return Koha::Clubs->get_enrollable($params); } -=head3 GetEnrollableClubsCount +=head3 get_enrollable_clubs_count =cut -sub GetEnrollableClubsCount { +sub get_enrollable_clubs_count { my ( $self, $is_enrollable_from_opac ) = @_; - my $e = $self->GetEnrollableClubs($is_enrollable_from_opac); + my $e = $self->get_enrollable_clubs($is_enrollable_from_opac); return $e->count(); } diff --git a/clubs/patron-clubs-tab.pl b/clubs/patron-clubs-tab.pl index ce815a2..e9e2f8f 100755 --- a/clubs/patron-clubs-tab.pl +++ b/clubs/patron-clubs-tab.pl @@ -43,8 +43,8 @@ my $borrowernumber = $cgi->param('borrowernumber'); my $borrower = Koha::Patrons->find($borrowernumber); -my @enrollments = $borrower->GetClubEnrollments(); -my @clubs = $borrower->GetEnrollableClubs(); +my @enrollments = $borrower->get_club_enrollments(); +my @clubs = $borrower->get_enrollable_clubs(); $template->param( enrollments => \@enrollments, diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index 4a43964..1659a99 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -898,8 +898,8 @@ No patron matched [% message | html %] [% END %] - [% SET enrollments = borrower.GetClubEnrollmentsCount %] - [% SET enrollable = borrower.GetEnrollableClubsCount %] + [% SET enrollments = borrower.get_club_enrollments_count %] + [% SET enrollable = borrower.get_enrollable_clubs_count %] [% IF CAN_user_clubs && ( enrollable || enrollments ) %]
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt index c65485a..532cdd4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -526,8 +526,8 @@ function validate1(date) {
  • [% END %]
  • [% debarments.size %] Restrictions
  • - [% SET enrollments = borrower.GetClubEnrollmentsCount %] - [% SET enrollable = borrower.GetEnrollableClubsCount %] + [% SET enrollments = borrower.get_club_enrollments_count %] + [% SET enrollable = borrower.get_enrollable_clubs_count %] [% IF CAN_user_clubs && ( enrollments || enrollable ) %]
  • diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt index 85f8f6b..11a0c5c 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt @@ -134,10 +134,10 @@ Using this account is not recommended because some parts of Koha will not functi [% IF ( BORROWER_INFO.amountlessthanzero ) %]
  • Credits ([% amountoutstanding | $Price %])
  • [% END %] [% END %] - [% IF borrower.GetClubEnrollmentsCount || borrower.GetEnrollableClubsCount(1) %] + [% IF borrower.get_club_enrollments_count || borrower.get_enrollable_clubs_count(1) %]
  • - Clubs ([% borrower.GetClubEnrollmentsCount %]/[% borrower.GetEnrollableClubsCount(1) %]) + Clubs ([% borrower.get_club_enrollments_count %]/[% borrower.get_enrollable_clubs_count(1) %])
  • [% END %] @@ -324,7 +324,7 @@ Using this account is not recommended because some parts of Koha will not functi [% END # IF issues_count %] - [% IF borrower.GetClubEnrollmentsCount || borrower.GetEnrollableClubsCount(1) %] + [% IF borrower.get_club_enrollments_count || borrower.get_enrollable_clubs_count(1) %]
    Loading...
    diff --git a/opac/clubs/clubs-tab.pl b/opac/clubs/clubs-tab.pl index 930fa06..82a4be0 100755 --- a/opac/clubs/clubs-tab.pl +++ b/opac/clubs/clubs-tab.pl @@ -40,8 +40,8 @@ my $borrowernumber = $cgi->param('borrowernumber'); my $borrower = Koha::Patrons->find($borrowernumber); -my @enrollments = $borrower->GetClubEnrollments(); -my @clubs = $borrower->GetEnrollableClubs( my $opac = 1 ); +my @enrollments = $borrower->get_club_enrollments(); +my @clubs = $borrower->get_enrollable_clubs( my $opac = 1 ); $template->param( enrollments => \@enrollments, -- 2.1.4