From 6a91c6abf60ac9295621c1bc07463753a92d669a Mon Sep 17 00:00:00 2001 From: Marius David Wieschollek Date: Wed, 30 Jan 2019 21:19:18 +0100 Subject: [PATCH 1/2] [#264] Fixed CSV export fails for empty fields --- js/exporters/exporter-csv.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/js/exporters/exporter-csv.js b/js/exporters/exporter-csv.js index 44d906a5..98c1724e 100644 --- a/js/exporters/exporter-csv.js +++ b/js/exporters/exporter-csv.js @@ -55,7 +55,10 @@ PassmanExporter.csv.export = function (credentials, FileService, EncryptService) row_data.push('"' + _fields + '"'); } else { - row_data.push('"' + _credential[field].replaceAll('"', '""') + '"'); + var data = _credential[field], + value = data === null ? '':data.replaceAll('"', '""'); + + row_data.push('"' + value + '"'); } } var progress = { From 5e499a76314cbddb9f936a290a803e8a8d994877 Mon Sep 17 00:00:00 2001 From: Marius David Wieschollek Date: Wed, 30 Jan 2019 21:49:41 +0100 Subject: [PATCH 2/2] [#264] Fixed spaces --- js/exporters/exporter-csv.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/js/exporters/exporter-csv.js b/js/exporters/exporter-csv.js index 98c1724e..3f4bf7d5 100644 --- a/js/exporters/exporter-csv.js +++ b/js/exporters/exporter-csv.js @@ -53,12 +53,12 @@ PassmanExporter.csv.export = function (credentials, FileService, EncryptService) var _fields = JSON.stringify(_credential[field]); _fields = _fields.replaceAll('"', '""'); row_data.push('"' + _fields + '"'); - } + } else { - var data = _credential[field], - value = data === null ? '':data.replaceAll('"', '""'); + var data = _credential[field], + value = data === null ? '':data.replaceAll('"', '""'); - row_data.push('"' + value + '"'); + row_data.push('"' + value + '"'); } } var progress = {