fix for org export

This commit is contained in:
Kyle Spearrin 2018-12-17 10:54:03 -05:00
parent e7b5868aad
commit 3b22df15e8
2 changed files with 4 additions and 3 deletions

View File

@ -13,6 +13,7 @@ export class ExportComponent {
formPromise: Promise<string>;
masterPassword: string;
format: 'json' | 'csv' = 'json';
showPassword = false;
constructor(protected cryptoService: CryptoService, protected i18nService: I18nService,
@ -53,11 +54,11 @@ export class ExportComponent {
}
protected getExportData() {
return this.exportService.getExport('csv');
return this.exportService.getExport(this.format);
}
protected getFileName(prefix?: string) {
return this.exportService.getFileName(prefix);
return this.exportService.getFileName(prefix, this.format);
}
private downloadFile(csv: string): void {

View File

@ -166,7 +166,7 @@ export class ExportService implements ExportServiceAbstraction {
cipher.build(c);
jsonDoc.items.push(cipher);
});
return JSON.stringify({}, null, ' ');
return JSON.stringify(jsonDoc, null, ' ');
}
}