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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-9 / +18 lines)
Lines 1267-1290 Link Here
1267
    <script>
1267
    <script>
1268
        $(document).ready(function() {
1268
        $(document).ready(function() {
1269
            var table_settings = [% TablesSettings.GetTableSettings( 'acqui', 'basket', 'orders', 'json' ) | $raw %];
1269
            var table_settings = [% TablesSettings.GetTableSettings( 'acqui', 'basket', 'orders', 'json' ) | $raw %];
1270
1271
            let supplier_report_column = table_settings.columns.find(c => c.columnname == 'supplier_report');
1270
            [% IF !(Koha.Preference('EDIFACT') && ediaccount) %]
1272
            [% IF !(Koha.Preference('EDIFACT') && ediaccount) %]
1271
                table_settings.columns.find(c => c.columnname == 'supplier_report').is_hidden = 1;
1273
                supplier_report_column.is_hidden = 1;
1272
                table_settings.columns.find(c => c.columnname == 'supplier_report').cannot_be_toggled = 1;
1274
                supplier_report_column.cannot_be_toggled = 1;
1273
            [% ELSE %]
1275
            [% ELSE %]
1274
                table_settings.columns.find(c => c.columnname == 'supplier_report').is_hidden = 0;
1276
                supplier_report_column.is_hidden = 0;
1275
            [% END %]
1277
            [% END %]
1278
            supplier_report_column.force_visibility = 1;
1279
1280
            let modify_column = table_settings.columns.find(c => c.columnname == 'modify');
1276
            [% IF ( active && !closedate ) %]
1281
            [% IF ( active && !closedate ) %]
1277
                table_settings.columns.find(c => c.columnname == 'modify').is_hidden = 0;
1282
                modify_column.is_hidden = 0;
1278
            [% ELSE %]
1283
            [% ELSE %]
1279
                table_settings.columns.find(c => c.columnname == 'modify').is_hidden = 1;
1284
                modify_column.is_hidden = 1;
1280
                table_settings.columns.find(c => c.columnname == 'modify').cannot_be_toggled = 1;
1285
                modify_column.cannot_be_toggled = 1;
1281
            [% END %]
1286
            [% END %]
1287
            modify_column.force_visibility = 1;
1288
1289
            let cancel_column = table_settings.columns.find(c => c.columnname == 'cancel');
1282
            [% IF !closedate || Koha.Preference('CancelOrdersInClosedBaskets') %]
1290
            [% IF !closedate || Koha.Preference('CancelOrdersInClosedBaskets') %]
1283
                table_settings.columns.find(c => c.columnname == 'cancel').is_hidden = 0;
1291
                cancel_column.is_hidden = 0;
1284
            [% ELSE %]
1292
            [% ELSE %]
1285
                table_settings.columns.find(c => c.columnname == 'cancel').is_hidden = 1;
1293
                cancel_column.is_hidden = 1;
1286
                table_settings.columns.find(c => c.columnname == 'cancel').cannot_be_toggled = 1;
1294
                cancel_column.cannot_be_toggled = 1;
1287
            [% END %]
1295
            [% END %]
1296
            cancel_column.force_visibility = 1;
1288
1297
1289
            $("#orders").kohaTable({
1298
            $("#orders").kohaTable({
1290
                bKohaColumnsUseNames: true,
1299
                bKohaColumnsUseNames: true,
(-)a/koha-tmpl/intranet-tmpl/prog/js/datatables.js (-1 / +36 lines)
Lines 950-955 function _dt_buttons(params) { Link Here
950
    return buttons;
950
    return buttons;
951
}
951
}
952
952
953
function _dt_force_visibility(table_settings, table_dt, state) {
954
    var columns_settings = table_settings.columns;
955
    let i = 0;
956
    let use_names = $(table_dt.table().node()).data("bKohaColumnsUseNames");
957
    if (use_names) {
958
        let force_vis_columns = table_settings.columns.filter(
959
            c => c.force_visibility
960
        );
961
        if (!force_vis_columns.length) return state;
962
        table_dt
963
            .columns(
964
                force_vis_columns
965
                    .map(c => "[data-colname='%s']".format(c.columnname))
966
                    .join(",")
967
            )
968
            .every(function () {
969
                state.columns[this.index()].visible =
970
                    table_settings.columns.find(
971
                        c =>
972
                            c.columnname ==
973
                            this.header().getAttribute("data-colname")
974
                    ).is_hidden
975
                        ? false
976
                        : true;
977
            });
978
    } else {
979
        throw new Error(
980
            "Cannot force column visibility without bKohaColumnsUseNames!"
981
        );
982
    }
983
    return state;
984
}
985
953
function _dt_visibility(table_settings, table_dt) {
986
function _dt_visibility(table_settings, table_dt) {
954
    let hidden_ids = [];
987
    let hidden_ids = [];
955
    if (table_settings) {
988
    if (table_settings) {
Lines 1183-1188 function _dt_save_restore_state(table_settings, external_filter_nodes = {}) { Link Here
1183
            delete state.search;
1216
            delete state.search;
1184
            state.columns.forEach(c => delete c.search);
1217
            state.columns.forEach(c => delete c.search);
1185
        }
1218
        }
1219
1220
        state = _dt_force_visibility(table_settings, this.api(), state);
1221
1186
        return state;
1222
        return state;
1187
    };
1223
    };
1188
1224
1189
- 

Return to bug 40982