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 341-346 modules: Link Here
341
  catalogue:
341
  catalogue:
342
    detail:
342
    detail:
343
      holdings_table:
343
      holdings_table:
344
        default_sort_order: 0
344
        columns:
345
        columns:
345
            -
346
            -
346
              columnname: holdings_checkbox
347
              columnname: holdings_checkbox
Lines 398-403 modules: Link Here
398
              cannot_be_modified: 1
399
              cannot_be_modified: 1
399
400
400
      otherholdings_table:
401
      otherholdings_table:
402
        default_sort_order: 0
401
        columns:
403
        columns:
402
            -
404
            -
403
              columnname: otherholdings_checkbox
405
              columnname: otherholdings_checkbox
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (-6 / +5 lines)
Lines 1367-1378 Note that permanent location is a code, and location may be an authval. Link Here
1367
1367
1368
        $(document).ready(function() {
1368
        $(document).ready(function() {
1369
            var ids = ['holdings_table', 'otherholdings_table'];
1369
            var ids = ['holdings_table', 'otherholdings_table'];
1370
            var columns_settings = [ [% TablesSettings.GetColumns('catalogue', 'detail','holdings_table','json') | $raw %], [% TablesSettings.GetColumns('catalogue', 'detail','otherholdings_table','json')  | $raw %] ];
1370
            var table_settings = [ [% TablesSettings.GetTableSettings('catalogue', 'detail','holdings_table','json') | $raw %], [% TablesSettings.GetTableSettings('catalogue', 'detail','otherholdings_table','json')  | $raw %] ];
1371
            var has_images = ["[% itemloop_has_images | html %]", "[% otheritemloop_has_images | html %]"];
1371
            var has_images = ["[% itemloop_has_images | html %]", "[% otheritemloop_has_images | html %]"];
1372
            for (var i in ids) {
1372
            for (var i in ids) {
1373
                var id = ids[i];
1373
                var id = ids[i];
1374
                if ( !has_images[i] ) { // remove the cover_image column
1374
                if ( !has_images[i] ) { // remove the cover_image column
1375
                    columns_settings.splice(1,1);
1375
                    table_settings.splice(1,1);
1376
                }
1376
                }
1377
                var dt_parameters = {
1377
                var dt_parameters = {
1378
                    'sDom': 't',
1378
                    'sDom': 't',
Lines 1381-1397 Note that permanent location is a code, and location may be an authval. Link Here
1381
                    "bKohaColumnsUseNames": true,
1381
                    "bKohaColumnsUseNames": true,
1382
                    "sDom": 'C<"top pager"ilpfB><"#filter_c">tr<"bottom pager"ip>',
1382
                    "sDom": 'C<"top pager"ilpfB><"#filter_c">tr<"bottom pager"ip>',
1383
                };
1383
                };
1384
                var table = KohaTable(id, dt_parameters, columns_settings[i], 'with_filters');
1384
                var table = KohaTable(id, dt_parameters, table_settings[i], 'with_filters');
1385
            }
1385
            }
1386
1386
1387
            [% IF Koha.Preference('AcquisitionDetails') %]
1387
            [% IF Koha.Preference('AcquisitionDetails') %]
1388
                var columns_settings = [% TablesSettings.GetColumns('catalogue', 'detail', 'acquisitiondetails-table', 'json') %];
1388
                var table_settings = [% TablesSettings.GetTableSettings('catalogue', 'detail', 'acquisitiondetails-table', 'json') %];
1389
                var acquisitiondetails_table = KohaTable("orders", {
1389
                var acquisitiondetails_table = KohaTable("orders", {
1390
                    "sDom": 'C<"top pager"ilpfB><"#filter_c">tr<"bottom pager"ip>',
1390
                    "sDom": 'C<"top pager"ilpfB><"#filter_c">tr<"bottom pager"ip>',
1391
                    'bPaginate': false,
1391
                    'bPaginate': false,
1392
                    'bAutoWidth': false,
1392
                    'bAutoWidth': false,
1393
                    "aaSorting": [[ 4, "desc" ]],
1393
                    "aaSorting": [[ 4, "desc" ]],
1394
                }, columns_settings);
1394
                }, table_settings);
1395
            [% END %]
1395
            [% END %]
1396
1396
1397
            [% IF suggestions.count %]
1397
            [% IF suggestions.count %]
1398
- 

Return to bug 29648