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

(-)a/C4/Utils/DataTables/TablesSettings.pm (-1 / +7 lines)
Lines 88-94 sub get_table_settings { Link Here
88
            tablename => $tablename,
88
            tablename => $tablename,
89
        }
89
        }
90
    )->next;
90
    )->next;
91
    return $rs ? $rs : $list->{modules}{$module}{$page}{$tablename};
91
92
    return {
93
        default_display_length => $rs ? $rs->default_display_length
94
        : $list->{modules}{$module}{$page}{$tablename}{default_display_length},
95
        default_sort_order => $rs ? $rs->default_sort_order
96
        : $list->{modules}{$module}{$page}{$tablename}{default_sort_order}
97
    };
92
}
98
}
93
99
94
sub get_modules {
100
sub get_modules {
(-)a/Koha/Template/Plugin/TablesSettings.pm (+3 lines)
Lines 132-137 sub GetTableSettings { Link Here
132
    $format //= q{};
132
    $format //= q{};
133
133
134
    my $settings = C4::Utils::DataTables::TablesSettings::get_table_settings( $module, $page, $table );
134
    my $settings = C4::Utils::DataTables::TablesSettings::get_table_settings( $module, $page, $table );
135
    my $columns = C4::Utils::DataTables::TablesSettings::get_columns( $module, $page, $table );
136
137
    $settings->{columns} = $columns;
135
138
136
    return $format eq 'json'
139
    return $format eq 'json'
137
        ? to_json( $settings || {} )
140
        ? to_json( $settings || {} )
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc (-1 / +10 lines)
Lines 3-14 Link Here
3
<!-- columns_settings.inc -->
3
<!-- columns_settings.inc -->
4
4
5
<script>
5
<script>
6
function KohaTable(id_selector, dt_parameters, columns_settings, add_filters) {
6
function KohaTable(id_selector, dt_parameters, table_settings, add_filters) {
7
    var counter = 0;
7
    var counter = 0;
8
    var hidden_ids = [];
8
    var hidden_ids = [];
9
    var included_ids = [];
9
    var included_ids = [];
10
    var selector = '#' + id_selector;
10
    var selector = '#' + id_selector;
11
11
12
    var columns_settings = table_settings['columns'];
13
12
    $(columns_settings).each( function() {
14
    $(columns_settings).each( function() {
13
        var named_id = $( 'thead th[data-colname="' + this.columnname + '"]', selector ).index( selector + ' th' );
15
        var named_id = $( 'thead th[data-colname="' + this.columnname + '"]', selector ).index( selector + ' th' );
14
        var used_id = dt_parameters.bKohaColumnsUseNames ? named_id : counter;
16
        var used_id = dt_parameters.bKohaColumnsUseNames ? named_id : counter;
Lines 182-187 function KohaTable(id_selector, dt_parameters, columns_settings, add_filters) { Link Here
182
        });
184
        });
183
    }
185
    }
184
186
187
    if ( table_settings.hasOwnProperty('default_display_length') ) {
188
        new_parameters["pageLength"] = table_settings['default_display_length'];
189
    }
190
    if ( table_settings.hasOwnProperty('default_sort_order') ) {
191
        new_parameters["order"] = [[ table_settings['default_sort_order'], 'asc' ]];
192
    }
193
185
    table.dataTable(new_parameters);
194
    table.dataTable(new_parameters);
186
    table.DataTable().on("column-visibility.dt", function(){
195
    table.DataTable().on("column-visibility.dt", function(){
187
        if( typeof columnsInit == 'function' ){
196
        if( typeof columnsInit == 'function' ){
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-8 / +5 lines)
Lines 982-1000 Link Here
982
        [% END %]
982
        [% END %]
983
    [% END %]
983
    [% END %]
984
    <script>
984
    <script>
985
        var columns_settings = [% TablesSettings.GetColumns( 'acqui', 'basket', 'orders', 'json' ) | $raw %];
986
        [% IF !(Koha.Preference('EDIFACT') && ediaccount) %]
987
        columns_settings.splice(13,1);
988
        [% END %]
989
        [% SET table_settings = TablesSettings.GetTableSettings( 'acqui', 'basket', 'orders' ) %];
990
        $(document).ready(function() {
985
        $(document).ready(function() {
986
            var table_settings = [% TablesSettings.GetTableSettings( 'acqui', 'basket', 'orders', 'json' ) | $raw %];
987
            [% IF !(Koha.Preference('EDIFACT') && ediaccount) %]
988
                table_settings['columns'].splice(13, 1);
989
            [% END %]
991
            KohaTable("orders", {
990
            KohaTable("orders", {
992
                "sPaginationType": "full",
991
                "sPaginationType": "full",
993
                "autoWidth": false,
992
                "autoWidth": false,
994
                "exportColumns": [0,1,2,3,4,5,6,7,8,9,10,11,12,13],
993
                "exportColumns": [0,1,2,3,4,5,6,7,8,9,10,11,12,13],
995
                "iDisplayLength": [% table_settings.default_display_length | html %],
994
            }, table_settings);
996
                "order": [[ [% table_settings.default_sort_order | html %], 'asc']],
997
            }, columns_settings);
998
995
999
            var cancelledorderst = $("#cancelledorderst").dataTable($.extend(true, {}, dataTablesDefaults, {
996
            var cancelledorderst = $("#cancelledorderst").dataTable($.extend(true, {}, dataTablesDefaults, {
1000
                "sPaginationType": "full"
997
                "sPaginationType": "full"
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt (-6 / +2 lines)
Lines 171-184 Link Here
171
    [% INCLUDE 'datatables.inc' %]
171
    [% INCLUDE 'datatables.inc' %]
172
    [% INCLUDE 'columns_settings.inc' %]
172
    [% INCLUDE 'columns_settings.inc' %]
173
    <script>
173
    <script>
174
        var columns_settings = [% TablesSettings.GetColumns( 'reports', 'orders_by_fund', 'funds-table', 'json' ) | $raw %];
174
        var table_settings = [% TablesSettings.GetTableSettings( 'reports', 'orders_by_fund', 'funds-table', 'json' ) %];
175
        [% SET table_settings = TablesSettings.GetTableSettings( 'reports', 'orders_by_fund', 'funds-table' ) %];
176
        $(document).ready( function () {
175
        $(document).ready( function () {
177
            var funds_table = KohaTable("funds", {
176
            var funds_table = KohaTable("funds", {
178
                "pageLength": [% table_settings.default_display_length | html %],
179
                "order": [[ [% table_settings.default_sort_order | html %], 'asc']],
180
                'autoWidth': false,
177
                'autoWidth': false,
181
            }, columns_settings );
178
            }, table_settings );
182
179
183
            showallbudgets = $('#budgetfilter').html();
180
            showallbudgets = $('#budgetfilter').html();
184
            $('#budgetfilter .b_inactive').remove();
181
            $('#budgetfilter .b_inactive').remove();
185
- 

Return to bug 29648