Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-09-13 01:58:44 +02:00
Code Issues Projects Releases Wiki Activity

fix for org export

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/angular/components/export.component.ts
View File

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

2
src/services/export.service.ts
View File

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