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

(-)a/admin/columns_settings.yml (+1 lines)
Lines 372-377 modules: Link Here
372
    detail:
372
    detail:
373
      holdings_table:
373
      holdings_table:
374
        default_display_length: 20
374
        default_display_length: 20
375
        default_sort_order: default
375
        columns:
376
        columns:
376
            -
377
            -
377
              columnname: holdings_checkbox
378
              columnname: holdings_checkbox
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc (-1 / +1 lines)
Lines 206-212 function KohaTable(id_selector, dt_parameters, table_settings, add_filters) { Link Here
206
            // pageLength needs to be a number, not a string, or it can cause issues with DataTable's next button.
206
            // pageLength needs to be a number, not a string, or it can cause issues with DataTable's next button.
207
            new_parameters["pageLength"] = parseInt(table_settings['default_display_length']);
207
            new_parameters["pageLength"] = parseInt(table_settings['default_display_length']);
208
        }
208
        }
209
        if ( table_settings.hasOwnProperty('default_sort_order') && table_settings['default_sort_order'] != null ) {
209
        if ( table_settings.hasOwnProperty('default_sort_order') && table_settings['default_sort_order'] != null && table_settings['default_sort_order'] != 'default' ) {
210
            new_parameters["order"] = [[ table_settings['default_sort_order'], 'asc' ]];
210
            new_parameters["order"] = [[ table_settings['default_sort_order'], 'asc' ]];
211
        }
211
        }
212
    }
212
    }
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt (+1 lines)
Lines 138-143 Link Here
138
                                    <p>
138
                                    <p>
139
                                        Default sort order:
139
                                        Default sort order:
140
                                        <select name="[% pagename | html %]|[% tablename | html %]_default_sort_order">
140
                                        <select name="[% pagename | html %]|[% tablename | html %]_default_sort_order">
141
                                                <option value="default">Default (none)</option>
141
                                            [% FOR column IN tables.$pagename.$tablename.columns %]
142
                                            [% FOR column IN tables.$pagename.$tablename.columns %]
142
                                                [% IF table_settings.default_sort_order == loop.count - 1 %]
143
                                                [% IF table_settings.default_sort_order == loop.count - 1 %]
143
                                                    <option value="[% loop.count - 1 %]" selected="selected">[% column.columnname | html %]</option>
144
                                                    <option value="[% loop.count - 1 %]" selected="selected">[% column.columnname | html %]</option>
(-)a/koha-tmpl/intranet-tmpl/prog/js/datatables.js (-1 / +1 lines)
Lines 989-995 function _dt_add_delay(table_dt, table_node, delay_ms) { Link Here
989
            if ( table_settings.hasOwnProperty('default_display_length') && table_settings['default_display_length'] != null ) {
989
            if ( table_settings.hasOwnProperty('default_display_length') && table_settings['default_display_length'] != null ) {
990
                settings["pageLength"] = table_settings['default_display_length'];
990
                settings["pageLength"] = table_settings['default_display_length'];
991
            }
991
            }
992
            if ( table_settings.hasOwnProperty('default_sort_order') && table_settings['default_sort_order'] != null ) {
992
            if ( table_settings.hasOwnProperty('default_sort_order') && table_settings['default_sort_order'] != null && table_settings['default_sort_order'] != 'default' ) {
993
                settings["order"] = [[ table_settings['default_sort_order'], 'asc' ]];
993
                settings["order"] = [[ table_settings['default_sort_order'], 'asc' ]];
994
            }
994
            }
995
        }
995
        }
(-)a/koha-tmpl/intranet-tmpl/prog/js/vue/components/KohaTable.vue (-2 / +2 lines)
Lines 153-159 export default { Link Here
153
            }
153
            }
154
            if (
154
            if (
155
                this.table_settings.hasOwnProperty("default_sort_order") &&
155
                this.table_settings.hasOwnProperty("default_sort_order") &&
156
                this.table_settings.default_sort_order != null
156
                this.table_settings.default_sort_order != null &&
157
                this.table_settings.default_sort_order != "default"
157
            ) {
158
            ) {
158
                this.options.order = [
159
                this.options.order = [
159
                    [this.table_settings.default_sort_order, "asc"],
160
                    [this.table_settings.default_sort_order, "asc"],
160
- 

Return to bug 38079