MaDgIK
/
openaire-library
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into new-theme

This commit is contained in:
Konstantinos Triantafyllou 2022-02-08 15:16:49 +02:00
parent 4c64aa44a9 0561d945c5
commit ef347e9c02
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
landingPages/result/resultLanding.component.ts
View File

@ -106,7 +106,8 @@ export class ResultLandingComponent {
public feedbackFields: string [] = [
'Title', 'Authors', 'Access rights',
'Publisher information', 'Funding Information',
'Persistent identifiers', 'Other'];
'Persistent identifiers', 'Sustainable Development Goals (SDG)',
'Fields of Science and Technology (FOS)', 'Other'];
public pidsArrayString: string = "";
public identifier: Identifier;

8
sharedComponents/input/input.component.ts
View File

@ -1,4 +1,5 @@
import {
AfterViewInit,
Component,
ElementRef,
EventEmitter,
@ -171,7 +172,7 @@ export interface Option {
`,
styleUrls: ['input.component.css']
})
export class InputComponent implements OnInit, OnDestroy, OnChanges {
export class InputComponent implements OnDestroy, AfterViewInit, OnChanges {
/** Basic information */
@Input('formInput') formControl: AbstractControl;
@Input('type') type: 'text' | 'URL' | 'logoURL' | 'autocomplete' | 'textarea' | 'select' | 'checkbox' | 'chips' = 'text';
@ -225,7 +226,7 @@ export class InputComponent implements OnInit, OnDestroy, OnChanges {
this.focusEmitter.emit(this.focused);
}
ngOnInit(): void {
ngAfterViewInit() {
this.reset();
}
@ -279,6 +280,9 @@ export class InputComponent implements OnInit, OnDestroy, OnChanges {
if (!this.formControl.value) {
this.formControl.setValue((this.type === "checkbox")?false:'');
}
if(this.input) {
this.input.nativeElement.disabled = this.formControl.disabled;
}
}
unsubscribe() {