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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers/tables/items/catalogue_detail.inc (-1 / +1 lines)
Lines 270-276 Link Here
270
        embed.push('analytics_count');
270
        embed.push('analytics_count');
271
    [% END %]
271
    [% END %]
272
272
273
    let items_table_settings = {
273
    var items_table_settings = {
274
        holdings: [% TablesSettings.GetTableSettings('catalogue', 'detail','holdings_table','json') | $raw %],
274
        holdings: [% TablesSettings.GetTableSettings('catalogue', 'detail','holdings_table','json') | $raw %],
275
        otherholdings: [% TablesSettings.GetTableSettings('catalogue', 'detail','otherholdings_table','json')  | $raw %],
275
        otherholdings: [% TablesSettings.GetTableSettings('catalogue', 'detail','otherholdings_table','json')  | $raw %],
276
    };
276
    };
(-)a/t/cypress/integration/KohaTable_spec.ts (-7 / +14 lines)
Lines 22-45 function build_libraries() { Link Here
22
        });
22
        });
23
}
23
}
24
24
25
function mock_table_settings(settings) {
25
function mock_table_settings(settings, table_settings_var) {
26
    cy.window().then(win => {
26
    cy.window().then(win => {
27
        win.table_settings.columns = win.table_settings.columns.map(c => ({
27
28
        let table_settings =
29
            typeof table_settings_var === "undefined"
30
                ? win.table_settings
31
                : table_settings_var
32
                      .split(".")
33
                      .reduce((acc, key) => acc[key], win);
34
35
        table_settings.columns = table_settings.columns.map(c => ({
28
            ...c,
36
            ...c,
29
            is_hidden: 0,
37
            is_hidden: 0,
30
            cannot_be_toggled: 0,
38
            cannot_be_toggled: 0,
31
        }));
39
        }));
32
        if (settings && settings.hasOwnProperty("default_save_state")) {
40
        if (settings && settings.hasOwnProperty("default_save_state")) {
33
            win.table_settings.default_save_state = settings.default_save_state;
41
            table_settings.default_save_state = settings.default_save_state;
34
        }
42
        }
35
        if (settings && settings.hasOwnProperty("default_save_state_search")) {
43
        if (settings && settings.hasOwnProperty("default_save_state_search")) {
36
            win.table_settings.default_save_state_search =
44
            table_settings.default_save_state_search =
37
                settings.default_save_state_search;
45
                settings.default_save_state_search;
38
        }
46
        }
39
47
40
        if (settings && settings.columns) {
48
        if (settings && settings.columns) {
41
            Object.entries(settings.columns).forEach(([name, values]) => {
49
            Object.entries(settings.columns).forEach(([name, values]) => {
42
                let column = win.table_settings.columns.find(
50
                let column = table_settings.columns.find(
43
                    cc => cc.columnname == name
51
                    cc => cc.columnname == name
44
                );
52
                );
45
                Object.entries(values).forEach(([prop, value]) => {
53
                Object.entries(values).forEach(([prop, value]) => {
Lines 47-53 function mock_table_settings(settings) { Link Here
47
                });
55
                });
48
            });
56
            });
49
        }
57
        }
50
        cy.wrap(win.table_settings.columns).as("columns");
58
        cy.wrap(table_settings.columns).as("columns");
51
    });
59
    });
52
}
60
}
53
describe("kohaTable (using REST API)", () => {
61
describe("kohaTable (using REST API)", () => {
54
- 

Return to bug 38461