0" [class.truncated]="projects.length > 3">
+ 0" [class.truncated]="projects.length > 3">
{{projectNames.slice(0,3).join(', ')}}
@@ -238,9 +238,9 @@ export class EntityMetadataComponent {
value = value + ' | ' + (project.acronym ? project.acronym :
(project.title.length > 25 ? (project.title.slice(0, 25) + '...'): project.title));
}
- if(project.code) {
- value = value + ' (' + project.code + ')';
- }
+ // if(project.code) {
+ // value = value + ' (' + project.code + ')';
+ // }
return value;
});
}
diff --git a/landingPages/landing-utils/landing-header/landing-header.component.ts b/landingPages/landing-utils/landing-header/landing-header.component.ts
index 11ab1c0c..adfe3268 100644
--- a/landingPages/landing-utils/landing-header/landing-header.component.ts
+++ b/landingPages/landing-utils/landing-header/landing-header.component.ts
@@ -21,6 +21,7 @@ import {AlertModal} from "../../../utils/modal/alert";
[languages]="languages" [programmingLanguages]="programmingLanguages"
[compatibility]="compatibility" [aggregationStatus]="aggregationStatus"
[thematic]="thematic" [type]="type" [prevPath]="prevPath"
+ [countries]="countries" [projects]="projects"
>
@@ -61,4 +62,6 @@ export class LandingHeaderComponent {
@Input() thematic: boolean; // data provider landing
@Input() type; // data provider landing
@Input() prevPath: string = "";
+ @Input() countries;
+ @Input() projects;
}
diff --git a/landingPages/landing-utils/showPublisher.component.ts b/landingPages/landing-utils/showPublisher.component.ts
index 004c146a..37c0838b 100644
--- a/landingPages/landing-utils/showPublisher.component.ts
+++ b/landingPages/landing-utils/showPublisher.component.ts
@@ -4,6 +4,12 @@ import {EnvProperties} from "../../utils/properties/env-properties";
@Component({
selector: 'showPublisher, [showPublisher]',
template: `
+
+ {{publisher}}
+
+
)
-
-
-
- {{publisher}}
`
})
diff --git a/landingPages/result/resultLanding.component.html b/landingPages/result/resultLanding.component.html
index 6a93da39..0abe1f56 100644
--- a/landingPages/result/resultLanding.component.html
+++ b/landingPages/result/resultLanding.component.html
@@ -222,7 +222,8 @@
[date]="resultLandingInfo.dateofacceptance" [embargoEndDate]="resultLandingInfo.embargoEndDate"
[publisher]="resultLandingInfo.publisher" [journal]="resultLandingInfo.journal"
[languages]="resultLandingInfo.languages" [programmingLanguages]="resultLandingInfo.programmingLanguages"
- [prevPath]="prevPath">
+ [prevPath]="prevPath" [countries]="resultLandingInfo.countries"
+ [projects]="resultLandingInfo.fundedByProjects">
diff --git a/sharedComponents/input/input.component.ts b/sharedComponents/input/input.component.ts
index 55acecd8..18036a87 100644
--- a/sharedComponents/input/input.component.ts
+++ b/sharedComponents/input/input.component.ts
@@ -566,7 +566,7 @@ export class InputComponent implements OnInit, OnDestroy, AfterViewInit, OnChang
}
}));
}
- if (this.formAsControl?.validator) {
+ if (this.formAsControl?.validator || this.formAsArray?.validator) {
let validator = this.formControl.validator({} as AbstractControl);
this.required = (validator && validator.required);
}
diff --git a/utils/modal/alert.ts b/utils/modal/alert.ts
index 4173ae39..27e6c0a4 100644
--- a/utils/modal/alert.ts
+++ b/utils/modal/alert.ts
@@ -205,6 +205,9 @@ export class AlertModal implements OnInit, AfterViewInit, OnDestroy {
open() {
if(typeof UIkit !== "undefined") {
UIkit.modal(this.element.nativeElement).show();
+ if(this.overflowBody) {
+ this.bodyElement.nativeElement.scrollTo(0, 0);
+ }
}
}