From 3fb82c65ea17f26189b2fa190f7e878934975f7e Mon Sep 17 00:00:00 2001 From: apapachristou Date: Mon, 2 Sep 2019 13:29:22 +0300 Subject: [PATCH] Fixes bug on grant description input, makes field not required --- .../src/app/ui/dmp/editor/grant-tab/grant-tab-model.ts | 3 +-- .../app/ui/dmp/editor/grant-tab/grant-tab.component.html | 6 +----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dmp-frontend/src/app/ui/dmp/editor/grant-tab/grant-tab-model.ts b/dmp-frontend/src/app/ui/dmp/editor/grant-tab/grant-tab-model.ts index 5c94793e5..1ec6166dd 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/grant-tab/grant-tab-model.ts +++ b/dmp-frontend/src/app/ui/dmp/editor/grant-tab/grant-tab-model.ts @@ -5,7 +5,6 @@ import { ValidationContext } from "../../../../common/forms/validation/validatio import { FormBuilder, FormGroup, Validators } from "@angular/forms"; import { BackendErrorValidator } from "../../../../common/forms/validation/custom-validator"; import { ValidJsonValidator } from "../../../../library/auto-complete/auto-complete-custom-validator"; -import { FunderFormModel } from "./funder-form-model"; export class GrantTabModel { public id: string; @@ -41,7 +40,7 @@ export class GrantTabModel { baseContext.validation.push({ key: 'id', validators: [] }); baseContext.validation.push({ key: 'label', validators: [Validators.required, BackendErrorValidator(this.validationErrorModel, 'label')] }); baseContext.validation.push({ key: 'status', validators: [] }); - baseContext.validation.push({ key: 'description', validators: [Validators.required, BackendErrorValidator(this.validationErrorModel, 'description')] }); + baseContext.validation.push({ key: 'description', validators: [BackendErrorValidator(this.validationErrorModel, 'description')] }); baseContext.validation.push({ key: 'existGrant', validators: [Validators.required, ValidJsonValidator, BackendErrorValidator(this.validationErrorModel, 'existGrant')] }); baseContext.validation.push({ key: 'funderId', validators: [ValidJsonValidator, BackendErrorValidator(this.validationErrorModel, 'funderId')] }); return baseContext; diff --git a/dmp-frontend/src/app/ui/dmp/editor/grant-tab/grant-tab.component.html b/dmp-frontend/src/app/ui/dmp/editor/grant-tab/grant-tab.component.html index 4d3ce06f2..fc3d7483a 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/grant-tab/grant-tab.component.html +++ b/dmp-frontend/src/app/ui/dmp/editor/grant-tab/grant-tab.component.html @@ -55,11 +55,7 @@ {{'GENERAL.VALIDATION.REQUIRED' | translate}} - - - {{grantformGroup.get('description').getError('backendError').message}} - - {{'GENERAL.VALIDATION.REQUIRED' | translate}} +