Bugzilla – Attachment 60611 Details for
Bug 12461
Add patron clubs feature
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 12461 - Use snake case
Bug-12461---Use-snake-case.patch (text/plain), 7.58 KB, created by
Kyle M Hall
on 2017-02-23 14:54:38 UTC
(
hide
)
Description:
Bug 12461 - Use snake case
Filename:
MIME Type:
Creator:
Kyle M Hall
Created:
2017-02-23 14:54:38 UTC
Size:
7.58 KB
patch
obsolete
>From 9d7312370bd2cdefa7a0d365e052094f6f0ea591 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >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 <span class="ex">[% message | html %]</span> > [% END %] > </li> > >- [% 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 ) %] > <li> > <a id="clubs-tab-link" href="#clubs-tab"> >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) { > </li> > [% END %] > <li><a id="debarments-tab-link" href="#reldebarments">[% debarments.size %] Restrictions</a></li> >- [% 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 ) %] > <li> > <a id="clubs-tab-link" href="#clubs-tab"> >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 ) %]<li><a href="#opac-user-fines">Credits ([% amountoutstanding | $Price %])</a></li>[% END %] > [% END %] > >- [% IF borrower.GetClubEnrollmentsCount || borrower.GetEnrollableClubsCount(1) %] >+ [% IF borrower.get_club_enrollments_count || borrower.get_enrollable_clubs_count(1) %] > <li> > <a id="opac-user-clubs-tab-link" href="#opac-user-clubs"> >- Clubs ([% borrower.GetClubEnrollmentsCount %]/[% borrower.GetEnrollableClubsCount(1) %]) >+ Clubs ([% borrower.get_club_enrollments_count %]/[% borrower.get_enrollable_clubs_count(1) %]) > </a> > </li> > [% END %] >@@ -324,7 +324,7 @@ Using this account is not recommended because some parts of Koha will not functi > [% END # IF issues_count %] > </div> <!-- / .opac-user-checkouts --> > >- [% IF borrower.GetClubEnrollmentsCount || borrower.GetEnrollableClubsCount(1) %] >+ [% IF borrower.get_club_enrollments_count || borrower.get_enrollable_clubs_count(1) %] > <div id="opac-user-clubs"> > Loading... > </div> >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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 12461
:
29105
|
30456
|
31567
|
35104
|
36098
|
36099
|
36192
|
38748
|
39181
|
43428
|
47821
|
47824
|
47825
|
47856
|
49110
|
49121
|
50422
|
50423
|
50426
|
50427
|
58818
|
58819
|
58820
|
59272
|
59273
|
60519
|
60520
|
60521
|
60610
|
60611
|
60612
|
60613
|
60614
|
60615
|
60616
|
60617
|
60618
|
60624
|
62778
|
62779
|
62813
|
62814
|
62815