From 7950009a4996ab33222535022aea5129c89c0a3c Mon Sep 17 00:00:00 2001 From: Sean Date: Mon, 2 Oct 2017 14:19:57 -0400 Subject: [PATCH 1/2] match regular expression for copy/csv to generate correspondant title --- static/js/vendor/DataTables/datatables.js | 4 ++-- staticfiles/js/vendor/DataTables/datatables.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/static/js/vendor/DataTables/datatables.js b/static/js/vendor/DataTables/datatables.js index b0f13ce6..5b6d061f 100755 --- a/static/js/vendor/DataTables/datatables.js +++ b/static/js/vendor/DataTables/datatables.js @@ -27592,7 +27592,7 @@ DataTable.ext.buttons.copyHtml5 = { var exportData = _exportData( dt, config ); var data = dt.buttons.exportData( config.exportOptions ); var output_ = exportData.str; - if (data.header[2][0] !== "T") { + if (data.header[2][0] == 2) { var str = $('tr:first').text() + '\n' var output = str + output_ } @@ -27701,7 +27701,7 @@ DataTable.ext.buttons.csvHtml5 = { var newLine = _newLine( config ); var output_ = _exportData( dt, config ).str; var data = dt.buttons.exportData( config.exportOptions ); - if (data.header[2][0] !== "T") { + if (data.header[2][0] == 2) { var str = $('tr:first').text() + '\n' var output = str + output_ } diff --git a/staticfiles/js/vendor/DataTables/datatables.js b/staticfiles/js/vendor/DataTables/datatables.js index b0f13ce6..5b6d061f 100644 --- a/staticfiles/js/vendor/DataTables/datatables.js +++ b/staticfiles/js/vendor/DataTables/datatables.js @@ -27592,7 +27592,7 @@ DataTable.ext.buttons.copyHtml5 = { var exportData = _exportData( dt, config ); var data = dt.buttons.exportData( config.exportOptions ); var output_ = exportData.str; - if (data.header[2][0] !== "T") { + if (data.header[2][0] == 2) { var str = $('tr:first').text() + '\n' var output = str + output_ } @@ -27701,7 +27701,7 @@ DataTable.ext.buttons.csvHtml5 = { var newLine = _newLine( config ); var output_ = _exportData( dt, config ).str; var data = dt.buttons.exportData( config.exportOptions ); - if (data.header[2][0] !== "T") { + if (data.header[2][0] == 2) { var str = $('tr:first').text() + '\n' var output = str + output_ } From 836d6615a5694f8a4f5944cad77184e62bcba145 Mon Sep 17 00:00:00 2001 From: Sean Date: Mon, 2 Oct 2017 14:26:23 -0400 Subject: [PATCH 2/2] match reg for excel output as well --- static/js/vendor/DataTables/datatables.js | 4 ++-- staticfiles/js/vendor/DataTables/datatables.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/static/js/vendor/DataTables/datatables.js b/static/js/vendor/DataTables/datatables.js index 5b6d061f..4ccaf270 100755 --- a/static/js/vendor/DataTables/datatables.js +++ b/static/js/vendor/DataTables/datatables.js @@ -27827,7 +27827,7 @@ DataTable.ext.buttons.excelHtml5 = { var myRegexp = /(\d+)/g; var regExp = /\(([^)]+)\)/; var run_number = myRegexp.exec(url); - if (data.header[2][0] !== "T") { + if (data.header[2][0] == 2) { var title = '_liabilities_change'; } else { @@ -27914,7 +27914,7 @@ DataTable.ext.buttons.excelHtml5 = { return ''+cells.join('')+''; }; - if (data.header[2][0] !== "T") { + if (data.header[2][0] == 2) { xml += addTit( $('tr:first').text() ); } else { diff --git a/staticfiles/js/vendor/DataTables/datatables.js b/staticfiles/js/vendor/DataTables/datatables.js index 5b6d061f..4ccaf270 100644 --- a/staticfiles/js/vendor/DataTables/datatables.js +++ b/staticfiles/js/vendor/DataTables/datatables.js @@ -27827,7 +27827,7 @@ DataTable.ext.buttons.excelHtml5 = { var myRegexp = /(\d+)/g; var regExp = /\(([^)]+)\)/; var run_number = myRegexp.exec(url); - if (data.header[2][0] !== "T") { + if (data.header[2][0] == 2) { var title = '_liabilities_change'; } else { @@ -27914,7 +27914,7 @@ DataTable.ext.buttons.excelHtml5 = { return ''+cells.join('')+''; }; - if (data.header[2][0] !== "T") { + if (data.header[2][0] == 2) { xml += addTit( $('tr:first').text() ); } else {