with previous commit
This commit is contained in:
parent
d0d98bc520
commit
abfb6342b2
|
@ -629,21 +629,14 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
onCallbackSuccess(data?: DatasetWizardModel, saveType?: SaveType): void {
|
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);
|
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) {
|
if (data) {
|
||||||
>>>>>>> c391cd5521858e9623d695ae9630295df416bf86
|
|
||||||
if (saveType === this.saveAnd.addNew) {
|
if (saveType === this.saveAnd.addNew) {
|
||||||
this.router.navigate(['/reload']).then(() => { this.router.navigate(['/datasets', 'new', this.formGroup.get('dmp').value.id]); })
|
this.router.navigate(['/reload']).then(() => { this.router.navigate(['/datasets', 'new', this.formGroup.get('dmp').value.id]); })
|
||||||
} else if (saveType === this.saveAnd.close) {
|
} else if (saveType === this.saveAnd.close) {
|
||||||
this.router.navigate(['/reload']).then(() => { this.router.navigate(['/plans', 'edit', this.formGroup.get('dmp').value.id]); });
|
this.router.navigate(['/reload']).then(() => { this.router.navigate(['/plans', 'edit', this.formGroup.get('dmp').value.id]); });
|
||||||
} else {
|
} else {
|
||||||
<<<<<<< HEAD
|
|
||||||
this.datasetWizardModel = new DatasetWizardEditorModel().fromModel(data);
|
this.datasetWizardModel = new DatasetWizardEditorModel().fromModel(data);
|
||||||
this.formGroupRawValue = JSON.parse(JSON.stringify(this.formGroup.getRawValue()));
|
this.formGroupRawValue = JSON.parse(JSON.stringify(this.formGroup.getRawValue()));
|
||||||
this.editMode = this.datasetWizardModel.status === DatasetStatus.Draft;
|
this.editMode = this.datasetWizardModel.status === DatasetStatus.Draft;
|
||||||
|
@ -667,9 +660,6 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr
|
||||||
}, 500);
|
}, 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]); });
|
||||||
=======
|
|
||||||
this.router.navigate(['/reload']).then(() => { this.router.navigate(['/datasets', 'edit', data.id]); });
|
|
||||||
>>>>>>> c391cd5521858e9623d695ae9630295df416bf86
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
this.router.navigate(['/datasets']);
|
this.router.navigate(['/datasets']);
|
||||||
|
|
Loading…
Reference in New Issue