@@ -, +, @@
- renaming 'Class methods' to 'internal methods'
- renaming 'borrower' and 'branch' methods to 'patron' and 'library'
---
Koha/Recall.pm | 18 +++++++++---------
Koha/Recalls.pm | 2 +-
circ/returns.pl | 2 +-
.../intranet-tmpl/prog/en/includes/recalls-reports.inc | 4 ++--
koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc | 2 +-
.../prog/en/modules/circ/recalls_overdue.tt | 4 ++--
.../prog/en/modules/circ/recalls_waiting.tt | 14 +++++++-------
.../intranet-tmpl/prog/en/modules/circ/returns.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-recalls.tt | 2 +-
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt | 2 +-
t/db_dependent/Koha/Recalls.t | 4 ++--
11 files changed, 28 insertions(+), 28 deletions(-)
--- a/Koha/Recall.pm
+++ a/Koha/Recall.pm
@@ -29,7 +29,7 @@ Koha::Recall - Koha Recall Object class
=head1 API
-=head2 Class Methods
+=head2 Internal Methods
=cut
@@ -70,33 +70,33 @@ sub item {
return $self->{_item};
}
-=head3 borrower
+=head3 patron
Returns the related Koha::Patron object for this recall
=cut
-sub borrower {
+sub patron {
my ($self) = @_;
- $self->{_borrower} ||= Koha::Patrons->find( $self->borrowernumber() );
+ $self->{_patron} ||= Koha::Patrons->find( $self->borrowernumber() );
- return $self->{_borrower};
+ return $self->{_patron};
}
-=head3 branch
+=head3 library
Returns the related Koha::Library object for this recall
=cut
-sub branch {
+sub library {
my ($self) = @_;
- $self->{_branch} ||= Koha::Libraries->find( $self->branchcode() );
+ $self->{_library} ||= Koha::Libraries->find( $self->branchcode() );
- return $self->{_branch};
+ return $self->{_library};
}
=head3 checkout
--- a/Koha/Recalls.pm
+++ a/Koha/Recalls.pm
@@ -30,7 +30,7 @@ Koha::Recalls - Koha Recalls Object Set class
=head1 API
-=head2 Class Methods
+=head2 Internal Methods
=cut
--- a/circ/returns.pl
+++ a/circ/returns.pl
@@ -190,7 +190,7 @@ if ( $query->param('reserve_id') ) {
if ( $query->param('recall_id') ){
my $recall = Koha::Recalls->find(scalar $query->param('recall_id'));
- my $recall_borrower = $recall->borrower;
+ my $recall_borrower = $recall->patron;
my $item = Koha::Items->find($recall->itemnumber);
my $biblio = Koha::Biblios->find($item->biblionumber);
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/recalls-reports.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/recalls-reports.inc
@@ -26,7 +26,7 @@
- [% recall.borrower.firstname %] [% recall.borrower.surname %] ([% recall.borrowernumber %])
+ [% recall.patron.firstname %] [% recall.patron.surname %] ([% recall.borrowernumber %])
|
@@ -59,7 +59,7 @@
|
- [% recall.branch.branchname %]
+ [% recall.library.branchname %]
|
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc
@@ -45,7 +45,7 @@
|
- [% recall.branch.branchname %]
+ [% recall.library.branchname %]
|
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_overdue.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_overdue.tt
@@ -58,7 +58,7 @@
|
- [% recall.borrower.firstname %] [% recall.borrower.surname %] ([% recall.borrowernumber %])
+ [% recall.patron.firstname %] [% recall.patron.surname %] ([% recall.borrowernumber %])
|
@@ -83,7 +83,7 @@
|
- [% recall.branch.branchname %]
+ [% recall.library.branchname %]
|
Cancel
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_waiting.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_waiting.tt
@@ -77,10 +77,10 @@
|
[% recall.borrower.firstname %] [% recall.borrower.surname %]
- [% IF ( recall.borrower.phone ) %] [% recall.borrower.phone %][% END %]
- [% IF ( recall.borrower.email ) %] [% recall.borrower.email %][% END %]
+ [% IF ( recall.patron.phone ) %] [% recall.patron.phone %][% END %]
+ [% IF ( recall.patron.email ) %] [% recall.patron.email %][% END %]
|
- [% recall.branch.branchname %] |
+ [% recall.library.branchname %] |
|
- [% recall.borrower.firstname %] [% recall.borrower.surname %]
- [% IF ( recall.borrower.phone ) %] [% recall.borrower.phone %][% END %]
- [% IF ( recall.borrower.email ) %] [% recall.borrower.email %][% END %]
+ [% recall.patron.firstname %] [% recall.patron.surname %]
+ [% IF ( recall.patron.phone ) %] [% recall.patron.phone %][% END %]
+ [% IF ( recall.patron.email ) %] [% recall.patron.email %][% END %]
|
- [% recall.branch.branchname %] |
+ [% recall.library.branchname %] |
|
Pick up location:
- [% RECALL.branch.branchname %]
+ [% RECALL.library.branchname %]
|
Status:
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
+++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
@@ -835,7 +835,7 @@ Using this account is not recommended because some parts of Koha will not functi
|
Pick up location:
- [% RECALL.branch.branchname %]
+ [% RECALL.library.branchname %]
|
Status:
--- a/t/db_dependent/Koha/Recalls.t
+++ a/t/db_dependent/Koha/Recalls.t
@@ -67,11 +67,11 @@ is( $recall->has_expired, 1, 'Recall has expired' );
is( $biblio->{biblionumber}, $recall->biblio->biblionumber, 'Can access biblio from recall' );
-is( $patron->{borrowernumber}, $recall->borrower->borrowernumber, 'Can access borrower from recall' );
+is( $patron->{borrowernumber}, $recall->patron->borrowernumber, 'Can access borrower from recall' );
is( $item->{itemnumber}, $recall->item->itemnumber, 'Can access item from recall' );
-is( $library->{branchcode}, $recall->branch->branchcode, 'Can access branch from recall' );
+is( $library->{branchcode}, $recall->library->branchcode, 'Can access branch from recall' );
is( $checkout->{issue_id}, $recall->checkout->issue_id, 'Can access checkout from recall' );
--
|