Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

Merge branch 'RED-8092' into 'master'

Browse Source 
RED-8092: fixed revert when there is a pre-existing value.

See merge request redactmanager/red-ui!240
This commit is contained in:
Dan Percic 2024-01-03 14:54:23 +01:00
commit 333700073b
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.ts
View File

@ -23,6 +23,7 @@ export class EditDossierAttributesComponent implements EditDossierSectionInterfa
imageAttributes: DossierAttributeWithValue[] = []; imageAttributes: DossierAttributeWithValue[] = [];
attributes: DossierAttributeWithValue[] = []; attributes: DossierAttributeWithValue[] = [];
form: UntypedFormGroup; form: UntypedFormGroup;
initialFormValue: { [key: string]: string } = {};
constructor( constructor(
private readonly _permissionsService: PermissionsService, private readonly _permissionsService: PermissionsService,
@ -58,6 +59,7 @@ export class EditDossierAttributesComponent implements EditDossierSectionInterfa
this._loadingService.start(); this._loadingService.start();
await this._loadAttributes(); await this._loadAttributes();
this.form = this._getForm(); this.form = this._getForm();
this.initialFormValue = this.form.getRawValue();
this._loadingService.stop(); this._loadingService.stop();
} }
@ -73,6 +75,7 @@ export class EditDossierAttributesComponent implements EditDossierSectionInterfa
await firstValueFrom(this._dossierAttributesService.setAttributes(this.dossier, dossierAttributeList)); await firstValueFrom(this._dossierAttributesService.setAttributes(this.dossier, dossierAttributeList));
await firstValueFrom(this._dossierAttributesService.loadAll(this.dossier.dossierTemplateId)); await firstValueFrom(this._dossierAttributesService.loadAll(this.dossier.dossierTemplateId));
await this._loadAttributes(); await this._loadAttributes();
this.initialFormValue = this.form.getRawValue();
return { success: true }; return { success: true };
} catch (error) { } catch (error) {
this._toaster.error(_('edit-dossier-dialog.attributes.error.generic')); this._toaster.error(_('edit-dossier-dialog.attributes.error.generic'));
@ -106,7 +109,7 @@ export class EditDossierAttributesComponent implements EditDossierSectionInterfa
} }
revert() { revert() {
this._loadAttributes().then(() => this.form.reset()); this._loadAttributes().then(() => this.form.reset(this.initialFormValue));
} }
currentAttrValue(attr: DossierAttributeWithValue): string { currentAttrValue(attr: DossierAttributeWithValue): string {