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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers/tables/items/catalogue_detail.inc (-6 / +5 lines)
Lines 345-351 Link Here
345
                orderable: true,
345
                orderable: true,
346
                render: function (data, type, row, meta) {
346
                render: function (data, type, row, meta) {
347
                    let node = '';
347
                    let node = '';
348
                    let item_type_description = row._strings.item_type_id.str;
348
                    let item_type_description = row._strings.item_type_id ? row._strings.item_type_id.str : row.item_type_id;
349
                    [% UNLESS noItemTypeImages %]
349
                    [% UNLESS noItemTypeImages %]
350
                        let image_location = item_type_image_locations[row.item_type_id];
350
                        let image_location = item_type_image_locations[row.item_type_id];
351
                        node += image_location
351
                        node += image_location
Lines 363-369 Link Here
363
                searchable: true,
363
                searchable: true,
364
                orderable: true,
364
                orderable: true,
365
                render: function (data, type, row, meta) {
365
                render: function (data, type, row, meta) {
366
                    return escape_str(row._strings.holding_library_id.str);
366
                    return escape_str(row._strings.holding_library_id ? row._strings.holding_library_id.str : row.holding_library_id);
367
                }
367
                }
368
            },
368
            },
369
            {
369
            {
Lines 372-383 Link Here
372
                searchable: true,
372
                searchable: true,
373
                orderable: true,
373
                orderable: true,
374
                render: function (data, type, row, meta) {
374
                render: function (data, type, row, meta) {
375
                    let nodes = '<span class="homebranchdesc">%s</span>'.format(escape_str(row._strings.home_library_id.str));
375
                    let nodes = '<span class="homebranchdesc">%s</span>'.format(escape_str(row._strings.home_library_id ? row._strings.home_library_id.str : row.home_library_id));
376
                    nodes += '<span class="shelvingloc">'
376
                    nodes += '<span class="shelvingloc">'
377
                    [%# If permanent location is defined, show description or code and             %]
377
                    [%# If permanent location is defined, show description or code and             %]
378
                    [%# display current location in parentheses. If not, display current location. %]
378
                    [%# display current location in parentheses. If not, display current location. %]
379
                    [%# Note that permanent location is a code, and location may be an authval.    %]
379
                    [%# Note that permanent location is a code, and location may be an authval.    %]
380
                    let loc_str = row._strings.location.str;
380
                    let loc_str = row._strings.location ? row._strings.location.str : row.location;
381
                    if ( row.permanent_location && row.permanent_location != row.location ) {
381
                    if ( row.permanent_location && row.permanent_location != row.location ) {
382
                        let permanent_loc_str = av_loc.get(row.permanent_location);
382
                        let permanent_loc_str = av_loc.get(row.permanent_location);
383
                        nodes += '%s (%s)'.format(escape_str(permanent_loc_str), escape_str(loc_str));
383
                        nodes += '%s (%s)'.format(escape_str(permanent_loc_str), escape_str(loc_str));
Lines 393-399 Link Here
393
                searchable: true,
393
                searchable: true,
394
                orderable: true,
394
                orderable: true,
395
                render: function (data, type, row, meta) {
395
                render: function (data, type, row, meta) {
396
                    return escape_str(row._strings.collection_code.str);
396
                    return escape_str(row._strings.collection_code ? row._strings.collection_code.str : row.collection_code);
397
                }
397
                }
398
            },
398
            },
399
            [% IF Koha.Preference('EnableItemGroups') %]
399
            [% IF Koha.Preference('EnableItemGroups') %]
400
- 

Return to bug 37375