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

(-)a/admin/columns_settings.pl (-2 / +6 lines)
Lines 50-57 if ( $action eq 'save' ) { Link Here
50
        next unless $table_id =~ m|^([^#]*)#(.*)$|;
50
        next unless $table_id =~ m|^([^#]*)#(.*)$|;
51
        my $default_display_length = $input->param( $table_id . '_default_display_length' );
51
        my $default_display_length = $input->param( $table_id . '_default_display_length' );
52
        my $default_sort_order     = $input->param( $table_id . '_default_sort_order' );
52
        my $default_sort_order     = $input->param( $table_id . '_default_sort_order' );
53
        if (   defined $default_display_length && $default_display_length ne ""
53
54
            && defined $default_sort_order     && $default_sort_order     ne "" ) {
54
        undef $default_display_length if defined $default_display_length && $default_display_length eq "";
55
        undef $default_sort_order if defined $default_sort_order && $default_sort_order eq "";
56
57
        if ( defined $default_display_length || defined $default_sort_order )
58
        {
55
            C4::Utils::DataTables::TablesSettings::update_table_settings(
59
            C4::Utils::DataTables::TablesSettings::update_table_settings(
56
                {
60
                {
57
                    module                 => $module,
61
                    module                 => $module,
(-)a/admin/columns_settings.yml (+2 lines)
Lines 313-318 modules: Link Here
313
  catalogue:
313
  catalogue:
314
    detail:
314
    detail:
315
      holdings_table:
315
      holdings_table:
316
        default_sort_order: 0
316
        columns:
317
        columns:
317
            -
318
            -
318
              columnname: holdings_checkbox
319
              columnname: holdings_checkbox
Lines 370-375 modules: Link Here
370
              cannot_be_modified: 1
371
              cannot_be_modified: 1
371
372
372
      otherholdings_table:
373
      otherholdings_table:
374
        default_sort_order: 0
373
        columns:
375
        columns:
374
            -
376
            -
375
              columnname: otherholdings_checkbox
377
              columnname: otherholdings_checkbox
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (-6 / +5 lines)
Lines 1336-1347 Note that permanent location is a code, and location may be an authval. Link Here
1336
1336
1337
        $(document).ready(function() {
1337
        $(document).ready(function() {
1338
            var ids = ['holdings_table', 'otherholdings_table'];
1338
            var ids = ['holdings_table', 'otherholdings_table'];
1339
            var columns_settings = [ [% TablesSettings.GetColumns('catalogue', 'detail','holdings_table','json') | $raw %], [% TablesSettings.GetColumns('catalogue', 'detail','otherholdings_table','json')  | $raw %] ];
1339
            var table_settings = [ [% TablesSettings.GetTableSettings('catalogue', 'detail','holdings_table','json') | $raw %], [% TablesSettings.GetTableSettings('catalogue', 'detail','otherholdings_table','json')  | $raw %] ];
1340
            var has_images = ["[% itemloop_has_images | html %]", "[% otheritemloop_has_images | html %]"];
1340
            var has_images = ["[% itemloop_has_images | html %]", "[% otheritemloop_has_images | html %]"];
1341
            for (var i in ids) {
1341
            for (var i in ids) {
1342
                var id = ids[i];
1342
                var id = ids[i];
1343
                if ( !has_images[i] ) { // remove the cover_image column
1343
                if ( !has_images[i] ) { // remove the cover_image column
1344
                    columns_settings.splice(1,1);
1344
                    table_settings.splice(1,1);
1345
                }
1345
                }
1346
                var dt_parameters = {
1346
                var dt_parameters = {
1347
                    'sDom': 't',
1347
                    'sDom': 't',
Lines 1350-1366 Note that permanent location is a code, and location may be an authval. Link Here
1350
                    "bKohaColumnsUseNames": true,
1350
                    "bKohaColumnsUseNames": true,
1351
                    "sDom": 'C<"top pager"ilpfB><"#filter_c">tr<"bottom pager"ip>',
1351
                    "sDom": 'C<"top pager"ilpfB><"#filter_c">tr<"bottom pager"ip>',
1352
                };
1352
                };
1353
                var table = KohaTable(id, dt_parameters, columns_settings[i], 'with_filters');
1353
                var table = KohaTable(id, dt_parameters, table_settings[i], 'with_filters');
1354
            }
1354
            }
1355
1355
1356
            [% IF Koha.Preference('AcquisitionDetails') %]
1356
            [% IF Koha.Preference('AcquisitionDetails') %]
1357
                var columns_settings = [% TablesSettings.GetColumns('catalogue', 'detail', 'acquisitiondetails-table', 'json') %];
1357
                var table_settings = [% TablesSettings.GetTableSettings('catalogue', 'detail', 'acquisitiondetails-table', 'json') %];
1358
                var acquisitiondetails_table = KohaTable("orders", {
1358
                var acquisitiondetails_table = KohaTable("orders", {
1359
                    "sDom": 'C<"top pager"ilpfB><"#filter_c">tr<"bottom pager"ip>',
1359
                    "sDom": 'C<"top pager"ilpfB><"#filter_c">tr<"bottom pager"ip>',
1360
                    'bPaginate': false,
1360
                    'bPaginate': false,
1361
                    'bAutoWidth': false,
1361
                    'bAutoWidth': false,
1362
                    "aaSorting": [[ 4, "desc" ]],
1362
                    "aaSorting": [[ 4, "desc" ]],
1363
                }, columns_settings);
1363
                }, table_settings);
1364
            [% END %]
1364
            [% END %]
1365
1365
1366
            [% IF suggestions.count %]
1366
            [% IF suggestions.count %]
1367
- 

Return to bug 29648