MaDgIK
/
monitor
13
0
Fork 0
Code Issues Pull Requests Projects Releases 15 Wiki Activity

Disable stakeholder card if user has not permissionts. Fix a bug in search stakeholders when user is logged in

This commit is contained in:
Konstantinos Triantafyllou 2021-10-19 15:26:39 +03:00
parent 9c286c3451
commit e83f5febf9
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/home/home.component.html
View File

@ -228,7 +228,7 @@
</div> </div>
</modal-alert> </modal-alert>
<ng-template #stakeholderCard let-stakeholder="stakeholder"> <ng-template #stakeholderCard let-stakeholder="stakeholder">
<div class="uk-card uk-card-default uk-text-center"> <div class="uk-card uk-card-default uk-text-center" [class.disabled]="!hasPermission(stakeholder)">
<div *ngIf="stakeholder.visibility && stakeholder.visibility !== 'PUBLIC'" <div *ngIf="stakeholder.visibility && stakeholder.visibility !== 'PUBLIC'"
class="uk-position-top-right uk-margin-top uk-margin-right uk-flex uk-flex-middle"> class="uk-position-top-right uk-margin-top uk-margin-right uk-flex uk-flex-middle">
<icon [name]="visibilityIcon.get(stakeholder.visibility)"></icon> <icon [name]="visibilityIcon.get(stakeholder.visibility)"></icon>

2
src/app/openaireLibrary

@ -1 +1 @@
Subproject commit 0b3e699796585c12ed06744d69a0e95e7629aa63 Subproject commit 5c7430ae7cde032c1b6b4d9bd990f761cd6b73e3

6
src/app/search-stakeholders/search-stakeholders.component.ts
View File

@ -8,7 +8,6 @@ import {AdvancedField, Filter, Value} from "../openaireLibrary/searchPages/searc
import {SearchFields} from "../openaireLibrary/utils/properties/searchFields"; import {SearchFields} from "../openaireLibrary/utils/properties/searchFields";
import {Session, User} from "../openaireLibrary/login/utils/helper.class"; import {Session, User} from "../openaireLibrary/login/utils/helper.class";
import {StringUtils} from "../openaireLibrary/utils/string-utils.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 {UserManagementService} from "../openaireLibrary/services/user-management.service";
import {StakeholderService} from "../openaireLibrary/monitor/services/stakeholder.service"; import {StakeholderService} from "../openaireLibrary/monitor/services/stakeholder.service";
import {NewSearchPageComponent} from "../openaireLibrary/searchPages/searchUtils/newSearchPage.component"; import {NewSearchPageComponent} from "../openaireLibrary/searchPages/searchUtils/newSearchPage.component";
@ -435,9 +434,12 @@ export class SearchStakeholdersComponent {
value_original_ids.push(["funder", "ri", "organization"]); value_original_ids.push(["funder", "ri", "organization"]);
filter_names.push("Accessibility"); filter_names.push("Accessibility");
filter_ids.push("access"); filter_ids.push("access");
if(!this.user) {
value_names.push(["Public", "Restricted"]); value_names.push(["Public", "Restricted"]);
value_original_ids.push(["public", "restricted"]); value_original_ids.push(["public", "restricted"]);
if(this.user) { } else {
value_names.push(["Public", "Restricted", "Private"]);
value_original_ids.push(["public", "restricted", "private"]);
filter_names.push("Role"); filter_names.push("Role");
filter_ids.push("role"); filter_ids.push("role");
value_names.push(["Manager", "Member"]); value_names.push(["Manager", "Member"]);

2
src/assets/common-assets

@ -1 +1 @@
Subproject commit 363790356aeb20339fab6d36516864ab44931dd7 Subproject commit 443ef4d544d370c698ed0856481b71e489a044d8