Commit 0e8b905f authored by Georgios Kolokythas's avatar Georgios Kolokythas
Browse files

Fixes bug on not displaying source properly when "Internal", on "Funder",... 

Fixes bug on not displaying source properly when "Internal", on "Funder", "Grant", "Project" at "New DMP" wizard view.
parent c78e0665

dmp-frontend/src/app/ui/quick-wizard/funder-editor/funder-editor-wizard.component.ts

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ export class FunderEditorWizardComponent implements OnInit { 
			initialItems: (extraData) => this.searchFunder(''),

			displayFn: (item) => item['label'],

			titleFn: (item) => item['label'],

			subtitleFn: (item) => item['source'] ? this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.SOURCE:') + item['source'] : this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.NO-SOURCE')

			subtitleFn: (item) => item['source'] ? this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.SOURCE:') + item['source'] : (item['key'] ? this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.SOURCE:') + item['key'] : this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.NO-SOURCE'))

		};



		if (!this.funderFormGroup) {

dmp-frontend/src/app/ui/quick-wizard/grant-editor/grant-editor-wizard.component.ts

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ export class GrantEditorWizardComponent extends BaseComponent implements OnInit, 
			initialItems: (extraData) => this.searchGrant(''),

			displayFn: (item) => item['label'] + this.getGrantIdText(item),

			titleFn: (item) => item['label'] + this.getGrantIdText(item),

			subtitleFn: (item) => item['source'] ? this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.SOURCE:') + item['source'] : this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.NO-SOURCE')

			subtitleFn: (item) => item['source'] ? this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.SOURCE:') + item['source'] : (item['key'] ? this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.SOURCE:') + item['key'] : this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.NO-SOURCE'))

		};



		if (this.funderFormGroup && this.funderFormGroup.valid) {

dmp-frontend/src/app/ui/quick-wizard/project-editor/project-editor-wizard.component.ts

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ export class ProjectEditorWizardComponent implements OnInit { 
			initialItems: (extraData) => this.searchProject(''),

			displayFn: (item) => item['label'],

			titleFn: (item) => item['label'],

			subtitleFn: (item) => item['source'] ? this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.SOURCE:') + item['source'] : this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.NO-SOURCE')

			subtitleFn: (item) => item['source'] ? this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.SOURCE:') + item['source'] : (item['key'] ? this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.SOURCE:') + item['key'] : this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.NO-SOURCE'))

		};



		if (!this.formGroup) {