@@ -, +, @@
---
Koha/Patron/Relationships.pm | 6 ++++--
Koha/Patrons.pm | 4 ++++
.../intranet-tmpl/prog/en/modules/circ/circulation.tt | 2 +-
.../prog/en/modules/members/memberentrygen.tt | 14 +++++++-------
.../prog/en/modules/members/moremember-brief.tt | 2 +-
members/memberentry.pl | 3 ++-
t/db_dependent/Items.t | 2 +-
7 files changed, 20 insertions(+), 13 deletions(-)
--- a/Koha/Patron/Relationships.pm
+++ a/Koha/Patron/Relationships.pm
@@ -82,8 +82,6 @@ sub guarantees {
return wantarray ? $guarantees->as_list : $guarantees;
}
-=cut
-
=head3 type
=cut
@@ -92,6 +90,10 @@ sub _type {
return 'BorrowerRelationship';
}
+=head3 object_class
+
+=cut
+
sub object_class {
return 'Koha::Patron::Relationship';
}
--- a/Koha/Patrons.pm
+++ a/Koha/Patrons.pm
@@ -366,6 +366,10 @@ sub _type {
return 'Borrower';
}
+=head3 object_class
+
+=cut
+
sub object_class {
return 'Koha::Patron';
}
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -832,7 +832,7 @@
[% IF relatives_issues_count %]
-
[% relatives_issues_count %] Relatives' checkouts
+ [% relatives_issues_count | html %] Relatives' checkouts
[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -470,23 +470,23 @@
[% END %]
- [% UNLESS norelationship %]
- [% IF possible_relationships %]
+ [% UNLESS norelationship %]
+ [% IF possible_relationships %]
- [% END %]
- [% END %]
+ [% END %]
+ [% END %]
[% UNLESS nophone %]
@@ -1231,7 +1231,7 @@
[% END %]
[% IF guarantor %]
- select_user( '[% guarantor.borrowernumber %]', [% To.json( guarantor.unblessed ) | $raw %] );
+ select_user( '[% guarantor.borrowernumber | html %]', [% To.json( guarantor.unblessed ) | $raw %] );
[% END %]
$("#cn_max").hide();
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt
@@ -60,7 +60,7 @@
[% END %]
[% END %]
-
+
--- a/members/memberentry.pl
+++ a/members/memberentry.pl
@@ -108,7 +108,8 @@ my $userenv = C4::Context->userenv;
$template->param( relationships => scalar $patron->guarantor_relationships ) if $patron;
my $guarantor_id = $input->param('guarantor_id');
-my $guarantor = Koha::Patrons->find( $guarantor_id ) if $guarantor_id;
+my $guarantor = undef;
+$guarantor = Koha::Patrons->find( $guarantor_id ) if $guarantor_id;
$template->param( guarantor => $guarantor );
my @delete_guarantor = $input->multi_param('delete_guarantor');
--- a/t/db_dependent/Items.t
+++ a/t/db_dependent/Items.t
@@ -589,7 +589,7 @@ subtest 'Koha::Item(s) tests' => sub {
is( ref($holdingbranch), 'Koha::Library', "Got Koha::Library from holding_branch method" );
is( $holdingbranch->branchcode(), $library2->{branchcode}, "Home branch code matches holdingbranch" );
- my $biblio = $item->biblio();
+ $biblio = $item->biblio();
is( ref($biblio), 'Koha::Biblio', "Got Koha::Biblio from biblio method" );
is( $biblio->title(), 'Silence in the library', 'Title matches biblio title' );
--