From e83f5febf96fbf513062331f8d211d25bf475f0f Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Tue, 19 Oct 2021 15:26:39 +0300 Subject: [PATCH] Disable stakeholder card if user has not permissionts. Fix a bug in search stakeholders when user is logged in --- src/app/home/home.component.html | 2 +- src/app/openaireLibrary | 2 +- .../search-stakeholders.component.ts | 10 ++++++---- src/assets/common-assets | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html index e7085d4..0695405 100644 --- a/src/app/home/home.component.html +++ b/src/app/home/home.component.html @@ -228,7 +228,7 @@ -
+
diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 0b3e699..5c7430a 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 0b3e699796585c12ed06744d69a0e95e7629aa63 +Subproject commit 5c7430ae7cde032c1b6b4d9bd990f761cd6b73e3 diff --git a/src/app/search-stakeholders/search-stakeholders.component.ts b/src/app/search-stakeholders/search-stakeholders.component.ts index dc2de78..927cd0c 100644 --- a/src/app/search-stakeholders/search-stakeholders.component.ts +++ b/src/app/search-stakeholders/search-stakeholders.component.ts @@ -8,7 +8,6 @@ import {AdvancedField, Filter, Value} from "../openaireLibrary/searchPages/searc import {SearchFields} from "../openaireLibrary/utils/properties/searchFields"; import {Session, User} from "../openaireLibrary/login/utils/helper.class"; import {StringUtils} from "../openaireLibrary/utils/string-utils.class"; -import {HelperFunctions} from "../openaireLibrary/utils/HelperFunctions.class"; import {UserManagementService} from "../openaireLibrary/services/user-management.service"; import {StakeholderService} from "../openaireLibrary/monitor/services/stakeholder.service"; import {NewSearchPageComponent} from "../openaireLibrary/searchPages/searchUtils/newSearchPage.component"; @@ -435,9 +434,12 @@ export class SearchStakeholdersComponent { value_original_ids.push(["funder", "ri", "organization"]); filter_names.push("Accessibility"); filter_ids.push("access"); - value_names.push(["Public", "Restricted"]); - value_original_ids.push(["public", "restricted"]); - if(this.user) { + if(!this.user) { + value_names.push(["Public", "Restricted"]); + value_original_ids.push(["public", "restricted"]); + } else { + value_names.push(["Public", "Restricted", "Private"]); + value_original_ids.push(["public", "restricted", "private"]); filter_names.push("Role"); filter_ids.push("role"); value_names.push(["Manager", "Member"]); diff --git a/src/assets/common-assets b/src/assets/common-assets index 3637903..443ef4d 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 363790356aeb20339fab6d36516864ab44931dd7 +Subproject commit 443ef4d544d370c698ed0856481b71e489a044d8