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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc (-2 / +19 lines)
Lines 90-95 function KohaTable(id_selector, dt_parameters, table_settings, add_filters, defa Link Here
90
        exportColumns = dt_parameters["exportColumns"];
90
        exportColumns = dt_parameters["exportColumns"];
91
    }
91
    }
92
92
93
    const export_format_spreadsheet = {
94
        body: function ( data, row, column, node ) {
95
            var newnode = $(node);
96
97
            if ( newnode.find(".noExport").length > 0 ) {
98
                newnode = newnode.clone();
99
                newnode.find(".noExport").remove();
100
            }
101
            let trimmed_str = newnode.text().replace( /\n/g, ' ' ).trim();
102
            const unsafeCharacters = /^[=+\-@\t\r]/;
103
            if ( unsafeCharacters.test(trimmed_str) ){
104
                trimmed_str = "'" + trimmed_str;
105
            }
106
            return trimmed_str;
107
        }
108
    }
109
93
    var export_format = {
110
    var export_format = {
94
        body: function ( data, row, column, node ) {
111
        body: function ( data, row, column, node ) {
95
            var newnode = $(node);
112
            var newnode = $(node);
Lines 124-130 function KohaTable(id_selector, dt_parameters, table_settings, add_filters, defa Link Here
124
            exportOptions: {
141
            exportOptions: {
125
                columns: exportColumns,
142
                columns: exportColumns,
126
                rows: exportRows,
143
                rows: exportRows,
127
                format:  export_format
144
                format:  export_format_spreadsheet
128
            },
145
            },
129
        },
146
        },
130
        {
147
        {
Lines 155-161 function KohaTable(id_selector, dt_parameters, table_settings, add_filters, defa Link Here
155
                exportOptions: {
172
                exportOptions: {
156
                    columns: exportColumns,
173
                    columns: exportColumns,
157
                    rows: exportRows,
174
                    rows: exportRows,
158
                    format:  export_format
175
                    format:  export_format_spreadsheet
159
                },
176
                },
160
            }
177
            }
161
        );
178
        );
(-)a/koha-tmpl/intranet-tmpl/prog/js/datatables.js (-3 / +19 lines)
Lines 606-611 function _dt_buttons(params){ Link Here
606
        exportColumns = settings["exportColumns"];
606
        exportColumns = settings["exportColumns"];
607
    }
607
    }
608
608
609
    const export_format_spreadsheet = {
610
        body: function ( data, row, column, node ) {
611
            var newnode = $(node);
612
613
            if ( newnode.find(".noExport").length > 0 ) {
614
                newnode = newnode.clone();
615
                newnode.find(".noExport").remove();
616
            }
617
            let trimmed_str = newnode.text().replace( /\n/g, ' ' ).trim();
618
            const unsafeCharacters = /^[=+\-@\t\r]/;
619
            if ( unsafeCharacters.test(trimmed_str) ){
620
                trimmed_str = "'" + trimmed_str;
621
            }
622
            return trimmed_str;
623
        }
624
    }
625
609
    var export_format = {
626
    var export_format = {
610
        body: function ( data, row, column, node ) {
627
        body: function ( data, row, column, node ) {
611
            var newnode = $(node);
628
            var newnode = $(node);
Lines 624-637 function _dt_buttons(params){ Link Here
624
            extend: 'excelHtml5',
641
            extend: 'excelHtml5',
625
            exportOptions: {
642
            exportOptions: {
626
                columns: exportColumns,
643
                columns: exportColumns,
627
                format:  export_format
644
                format:  export_format_spreadsheet
628
            },
645
            },
629
        },
646
        },
630
        {
647
        {
631
            extend: 'csvHtml5',
648
            extend: 'csvHtml5',
632
            exportOptions: {
649
            exportOptions: {
633
                columns: exportColumns,
650
                columns: exportColumns,
634
                format:  export_format
651
                format:  export_format_spreadsheet
635
            },
652
            },
636
        },
653
        },
637
        {
654
        {
638
- 

Return to bug 37727