From abfb6342b237f7c862e24c210f04bc83c775d3e2 Mon Sep 17 00:00:00 2001 From: apapachristou Date: Mon, 2 Nov 2020 18:14:10 +0200 Subject: [PATCH] with previous commit --- .../dataset/dataset-wizard/dataset-wizard.component.ts | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts index 3f673d43d..ea706d349 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts @@ -629,21 +629,14 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr }); } -<<<<<<< HEAD onCallbackSuccess(data?: DatasetWizardModel, saveType?: SaveType): void { - this.uiNotificationService.snackBarNotification(this.isNew ? this.language.instant('GENERAL.SNACK-BAR.SUCCESSFUL-CREATION') : this.language.instant('GENERAL.SNACK-BAR.SUCCESSFUL-UPDATE'), SnackBarNotificationLevel.Success); - if (data.id) { -======= - onCallbackSuccess(data?: DatasetWizardEditorModel, saveType?: SaveType): void { this.uiNotificationService.snackBarNotification(this.isNew ? this.language.instant('GENERAL.SNACK-BAR.SUCCESSFUL-CREATION') : this.language.instant('GENERAL.SNACK-BAR.SUCCESSFUL-UPDATE'), SnackBarNotificationLevel.Success); if (data) { ->>>>>>> c391cd5521858e9623d695ae9630295df416bf86 if (saveType === this.saveAnd.addNew) { this.router.navigate(['/reload']).then(() => { this.router.navigate(['/datasets', 'new', this.formGroup.get('dmp').value.id]); }) } else if (saveType === this.saveAnd.close) { this.router.navigate(['/reload']).then(() => { this.router.navigate(['/plans', 'edit', this.formGroup.get('dmp').value.id]); }); } else { -<<<<<<< HEAD this.datasetWizardModel = new DatasetWizardEditorModel().fromModel(data); this.formGroupRawValue = JSON.parse(JSON.stringify(this.formGroup.getRawValue())); this.editMode = this.datasetWizardModel.status === DatasetStatus.Draft; @@ -667,9 +660,6 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr }, 500); // this.router.navigate(['/reload']).then(() => { this.router.navigate(['/datasets', 'edit', data.id]); }); -======= - this.router.navigate(['/reload']).then(() => { this.router.navigate(['/datasets', 'edit', data.id]); }); ->>>>>>> c391cd5521858e9623d695ae9630295df416bf86 } } else { this.router.navigate(['/datasets']);