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

(-)a/Koha/Patron.pm (-1 / +1 lines)
Lines 505-511 Returns a Koha::Library object representing the patron's home library. Link Here
505
505
506
sub library {
506
sub library {
507
    my ( $self ) = @_;
507
    my ( $self ) = @_;
508
    return Koha::Library->_new_from_dbic($self->_result->branchcode);
508
    return Koha::Library->_new_from_dbic($self->_result->library);
509
}
509
}
510
510
511
=head3 sms_provider
511
=head3 sms_provider
(-)a/Koha/Schema/Result/Borrower.pm (+7 lines)
Lines 2191-2196 __PACKAGE__->many_to_many("permissions", "user_permissions", "permission"); Link Here
2191
# Created by DBIx::Class::Schema::Loader v0.07051 @ 2024-05-02 11:36:36
2191
# Created by DBIx::Class::Schema::Loader v0.07051 @ 2024-05-02 11:36:36
2192
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:jUOMoSonNmA3KwtZKVxqOA
2192
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:jUOMoSonNmA3KwtZKVxqOA
2193
2193
2194
__PACKAGE__->belongs_to(
2195
  "library",
2196
  "Koha::Schema::Result::Branch",
2197
  { branchcode => "branchcode" },
2198
  { is_deferrable => 1, on_delete => "RESTRICT", on_update => "RESTRICT" },
2199
);
2200
2194
__PACKAGE__->has_many(
2201
__PACKAGE__->has_many(
2195
  "restrictions",
2202
  "restrictions",
2196
  "Koha::Schema::Result::BorrowerDebarment",
2203
  "Koha::Schema::Result::BorrowerDebarment",
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers/tables/items/catalogue_detail.inc (-2 / +2 lines)
Lines 372-378 Link Here
372
            },
372
            },
373
            [% END %]
373
            [% END %]
374
            {
374
            {
375
                data: "me.holding_library_id:holding_library.name",
375
                data: "holding_library.name:me.holding_library_id",
376
                className: "location",
376
                className: "location",
377
                searchable: true,
377
                searchable: true,
378
                orderable: true,
378
                orderable: true,
Lines 381-387 Link Here
381
                }
381
                }
382
            },
382
            },
383
            {
383
            {
384
                data: "me.home_library_id:home_library.name",
384
                data: "home_library.name:me.home_library_id",
385
                className: "homebranch",
385
                className: "homebranch",
386
                searchable: true,
386
                searchable: true,
387
                orderable: true,
387
                orderable: true,
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc (-6 / +4 lines)
Lines 575-589 Link Here
575
                            }
575
                            }
576
                            [% CASE 'branch' %]
576
                            [% CASE 'branch' %]
577
                            {
577
                            {
578
                                "data": "library_id",
578
                                "data": "library.name:me.library_id",
579
                                "searchable": true,
579
                                "searchable": true,
580
                                "orderable": true,
580
                                "orderable": true,
581
                                "render": function( data, type, row, meta ) {
581
                                "render": function( data, type, row, meta ) {
582
                                    let library_name = libraries_map[data].branchname
582
                                    if( !singleBranchMode && row.library.library_id == logged_in_library_id ) {
583
                                    if( !singleBranchMode && data == logged_in_library_id ) {
583
                                        return "<span class=\"currentlibrary\">" + escape_str(row.library.name) + "</span>";
584
                                        return "<span class=\"currentlibrary\">" + escape_str(library_name) + "</span>";
585
                                    } else {
584
                                    } else {
586
                                        return escape_str(library_name);
585
                                        return escape_str(row.library.name);
587
                                    }
586
                                    }
588
                                }
587
                                }
589
                            }
588
                            }
590
- 

Return to bug 38130