View | Details | Raw Unified | Return to bug 14570
Collapse All | Expand All

(-)a/Koha/Patron/Relationships.pm (-2 / +4 lines)
Lines 82-89 sub guarantees { Link Here
82
    return wantarray ? $guarantees->as_list : $guarantees;
82
    return wantarray ? $guarantees->as_list : $guarantees;
83
}
83
}
84
84
85
=cut
86
87
=head3 type
85
=head3 type
88
86
89
=cut
87
=cut
Lines 92-97 sub _type { Link Here
92
    return 'BorrowerRelationship';
90
    return 'BorrowerRelationship';
93
}
91
}
94
92
93
=head3 object_class
94
95
=cut
96
95
sub object_class {
97
sub object_class {
96
    return 'Koha::Patron::Relationship';
98
    return 'Koha::Patron::Relationship';
97
}
99
}
(-)a/Koha/Patrons.pm (+4 lines)
Lines 368-373 sub _type { Link Here
368
    return 'Borrower';
368
    return 'Borrower';
369
}
369
}
370
370
371
=head3 object_class
372
373
=cut
374
371
sub object_class {
375
sub object_class {
372
    return 'Koha::Patron';
376
    return 'Koha::Patron';
373
}
377
}
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-1 / +1 lines)
Lines 824-830 Link Here
824
                            </li>
824
                            </li>
825
825
826
                            [% IF relatives_issues_count %]
826
                            [% IF relatives_issues_count %]
827
                                <li><a id="relatives-issues-tab" href="#relatives-issues">[% relatives_issues_count %] Relatives' checkouts</a></li>
827
                                <li><a id="relatives-issues-tab" href="#relatives-issues">[% relatives_issues_count | html %] Relatives' checkouts</a></li>
828
                            [% END %]
828
                            [% END %]
829
829
830
                            <li>
830
                            <li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (-7 / +7 lines)
Lines 470-492 Link Here
470
            </li>
470
            </li>
471
        [% END %]
471
        [% END %]
472
472
473
		[% UNLESS norelationship %]
473
        [% UNLESS norelationship %]
474
			[% IF possible_relationships %]
474
            [% IF possible_relationships %]
475
                <li>
475
                <li>
476
                    <label for="relationship">Relationship: </label>
476
                    <label for="relationship">Relationship: </label>
477
                    <select class="relationship" name="relationship">
477
                    <select class="relationship" name="relationship">
478
                        <option value=""></option>
478
                        <option value=""></option>
479
                        [% FOREACH pr IN possible_relationships.split('\|') %]
479
                        [% FOREACH pr IN possible_relationships.split('\|') %]
480
                            [% IF pr == relationship %]
480
                            [% IF pr == relationship %]
481
                                <option value="[% pr %]" selected="selected">[% pr %]</option>
481
                                <option value="[% pr | html %]" selected="selected">[% pr | html %]</option>
482
                            [% ELSE %]
482
                            [% ELSE %]
483
                                <option value="[% pr %]">[% pr %]</option>
483
                                <option value="[% pr | html %]">[% pr | html %]</option>
484
                            [% END %]
484
                            [% END %]
485
                        [% END %]
485
                        [% END %]
486
                    </select>
486
                    </select>
487
                </li>
487
                </li>
488
			[% END %]
488
            [% END %]
489
		[% END %]
489
        [% END %]
490
490
491
        [% UNLESS nophone %]
491
        [% UNLESS nophone %]
492
            <li>
492
            <li>
Lines 1231-1237 Link Here
1231
            [% END %]
1231
            [% END %]
1232
1232
1233
            [% IF guarantor %]
1233
            [% IF guarantor %]
1234
                select_user( '[% guarantor.borrowernumber %]', [% To.json( guarantor.unblessed ) | $raw %] );
1234
                select_user( '[% guarantor.borrowernumber | html %]', [% To.json( guarantor.unblessed ) | $raw %] );
1235
            [% END %]
1235
            [% END %]
1236
1236
1237
            $("#cn_max").hide();
1237
            $("#cn_max").hide();
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt (-1 / +1 lines)
Lines 60-66 Link Here
60
                    </li>
60
                    </li>
61
                [% END %]
61
                [% END %]
62
            [% END %]
62
            [% END %]
63
	    </ol>
63
        </ol>
64
    </div>
64
    </div>
65
</div>
65
</div>
66
</div>
66
</div>
(-)a/members/memberentry.pl (-1 / +2 lines)
Lines 108-114 my $userenv = C4::Context->userenv; Link Here
108
$template->param( relationships => scalar $patron->guarantor_relationships ) if $patron;
108
$template->param( relationships => scalar $patron->guarantor_relationships ) if $patron;
109
109
110
my $guarantor_id = $input->param('guarantor_id');
110
my $guarantor_id = $input->param('guarantor_id');
111
my $guarantor = Koha::Patrons->find( $guarantor_id ) if $guarantor_id;
111
my $guarantor = undef;
112
$guarantor = Koha::Patrons->find( $guarantor_id ) if $guarantor_id;
112
$template->param( guarantor => $guarantor );
113
$template->param( guarantor => $guarantor );
113
114
114
my @delete_guarantor = $input->multi_param('delete_guarantor');
115
my @delete_guarantor = $input->multi_param('delete_guarantor');
(-)a/t/db_dependent/Items.t (-2 / +1 lines)
Lines 589-595 subtest 'Koha::Item(s) tests' => sub { Link Here
589
    is( ref($holdingbranch), 'Koha::Library', "Got Koha::Library from holding_branch method" );
589
    is( ref($holdingbranch), 'Koha::Library', "Got Koha::Library from holding_branch method" );
590
    is( $holdingbranch->branchcode(), $library2->{branchcode}, "Home branch code matches holdingbranch" );
590
    is( $holdingbranch->branchcode(), $library2->{branchcode}, "Home branch code matches holdingbranch" );
591
591
592
    my $biblio = $item->biblio();
592
    $biblio = $item->biblio();
593
    is( ref($biblio), 'Koha::Biblio', "Got Koha::Biblio from biblio method" );
593
    is( ref($biblio), 'Koha::Biblio', "Got Koha::Biblio from biblio method" );
594
    is( $biblio->title(), 'Silence in the library', 'Title matches biblio title' );
594
    is( $biblio->title(), 'Silence in the library', 'Title matches biblio title' );
595
595
596
- 

Return to bug 14570