+ [organizationId]="organizationId" [properties]=properties [prevPath]="prevPath">
0"
@@ -184,7 +184,7 @@
+ [properties]="properties" [prevPath]="prevPath">
0"
@@ -192,7 +192,7 @@
+ [properties]="properties" [prevPath]="prevPath">
0"
@@ -200,7 +200,7 @@
+ [properties]="properties" [prevPath]="prevPath">
0"
@@ -208,7 +208,7 @@
+ [properties]="properties" [prevPath]="prevPath">
0"
@@ -216,7 +216,7 @@
+ [properties]="properties" [prevPath]="prevPath">
@@ -247,7 +247,7 @@
[id]="organizationInfo.objIdentifier"
[ids]="organizationInfo.deletedByInferenceIds"
[modal]="AlertModalDeletedByInference"
- [type]="'organizations'">
+ [type]="'organizations'" [prevPath]="prevPath">
diff --git a/landingPages/organization/organization.component.ts b/landingPages/organization/organization.component.ts
index 3a7e257f..8e6410b1 100644
--- a/landingPages/organization/organization.component.ts
+++ b/landingPages/organization/organization.component.ts
@@ -34,6 +34,9 @@ declare var ResizeObserver;
templateUrl: 'organization.component.html',
})
export class OrganizationComponent {
+ public referrer: string;
+ public prevPath: string;
+
@Input() piwikSiteId = null;
@Input() communityId = null;
@@ -167,6 +170,13 @@ export class OrganizationComponent {
this.updateTitle("Organization");
this.updateDescription("");
+ if(params["pv"]) {
+ this.prevPath = params["pv"];
+ }
+ if((typeof document !== 'undefined') && document.referrer) {
+ this.referrer = document.referrer;
+ }
+
this.organizationId = params['organizationId'];
if (this.organizationId && StringUtils.isOpenAIREID(this.organizationId)) {
@@ -805,4 +815,12 @@ export class OrganizationComponent {
public scroll() {
HelperFunctions.scroll();
}
+
+ public get eoscBackLink() {
+ if(this.prevPath && this.referrer && ((this.referrer == "https://eosc-search-service.grid.cyfronet.pl/") || (this.referrer == "https://beta.search.marketplace.eosc-portal.eu/") || (this.referrer == "https://search.marketplace.eosc-portal.eu/"))) {
+ return this.referrer+atob(this.prevPath);
+ } else {
+ return "https://"+(this.properties.environment == "beta" ? "beta" : "")+"search.marketplace.eosc-portal.eu/";
+ }
+ }
}
diff --git a/landingPages/project/project.component.html b/landingPages/project/project.component.html
index 813953a2..d5134ff0 100644
--- a/landingPages/project/project.component.html
+++ b/landingPages/project/project.component.html
@@ -4,7 +4,7 @@