MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Fixes bug: after discard grant was not set to previous value

This commit is contained in:
apapachristou 2020-10-07 12:42:10 +03:00
parent 166f0f7c37
commit d856255405
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.ts
View File

@ -51,6 +51,7 @@ import { CloneDialogComponent } from '../clone/clone-dialog/clone-dialog.compone
import { DatasetWizardModel } from '@app/core/model/dataset/dataset-wizard'; import { DatasetWizardModel } from '@app/core/model/dataset/dataset-wizard';
import { DatasetService } from '@app/core/services/dataset/dataset.service'; import { DatasetService } from '@app/core/services/dataset/dataset.service';
import { DmpToDatasetDialogComponent } from '../dmp-to-dataset/dmp-to-dataset-dialog.component'; import { DmpToDatasetDialogComponent } from '../dmp-to-dataset/dmp-to-dataset-dialog.component';
import { GrantEditorModel } from '@app/ui/grant/editor/grant-editor.model';
@Component({ @Component({
selector: 'app-dmp-editor-component', selector: 'app-dmp-editor-component',
@ -826,7 +827,19 @@ export class DmpEditorComponent extends BaseComponent implements OnInit, IBreadC
this.isDiscarded = true; this.isDiscarded = true;
this.hasChanges = false; this.hasChanges = false;
if (!this.isNew) { if (!this.isNew) {
let grantControl;
if(this.formGroup.get('grant').get('existGrant')) {
grantControl = new GrantTabModel();
grantControl.fromModel(this.formGroup.get('grant').get('existGrant').value);
} else {
grantControl = new GrantEditorModel();
grantControl.fromModel(this.formGroup.get('grant').value);
}
grantControl.buildForm()
this.formGroup.patchValue(JSON.parse(JSON.stringify(this.formGroupRawValue))); this.formGroup.patchValue(JSON.parse(JSON.stringify(this.formGroupRawValue)));
this.formGroup.get('grant').get('existGrant').setValue(grantControl.existGrant);
} else { } else {
this.formGroup.reset(); this.formGroup.reset();
this.formGroup.get('extraProperties').get('visible').setValue(false); this.formGroup.get('extraProperties').get('visible').setValue(false);