diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary
index 1b98944..5e4aaab 160000
--- a/src/app/openaireLibrary
+++ b/src/app/openaireLibrary
@@ -1 +1 @@
-Subproject commit 1b989441db0b1f808d1b626d3588901d54ffaf90
+Subproject commit 5e4aaab04f89446f956d524469ef2a856f556de5
diff --git a/src/app/pages/affiliations/affiliations.component.ts b/src/app/pages/affiliations/affiliations.component.ts
index 8cba66c..2fd937e 100644
--- a/src/app/pages/affiliations/affiliations.component.ts
+++ b/src/app/pages/affiliations/affiliations.component.ts
@@ -113,6 +113,7 @@ export class AffiliationsComponent implements OnInit, OnDestroy {
deleteAffiliationOpen(index: number) {
this.index = index;
let affiliation: Affiliation = this.affiliations[index];
+ console.log(index, affiliation)
this.removeAffiliationModal.alertTitle = 'Delete Organization';
this.removeAffiliationModal.message = 'Do you want to remove ' +
affiliation.name + ' from Organizations?';
@@ -164,7 +165,8 @@ export class AffiliationsComponent implements OnInit, OnDestroy {
removeAffiliation() {
this.loading = true;
- this.affiliationService.deleteAffiliation(this.properties.communityAPI + this.community.communityId + '/organizations',
+ console.log(this.index, this.affiliations[this.index].id)
+ this.affiliationService.deleteAffiliation(this.properties.communityAPI + this.community.communityId + '/organizations?organizationName='+this.affiliations[this.index].name,
this.affiliations[this.index].id).subscribe((deleteOK) => {
this.affiliations.splice(this.index, 1);
if (this.currentPage.length === 0) {
diff --git a/src/app/pages/community-info/profile/edit-community/edit-community.component.ts b/src/app/pages/community-info/profile/edit-community/edit-community.component.ts
index 24c0046..d418d0b 100644
--- a/src/app/pages/community-info/profile/edit-community/edit-community.component.ts
+++ b/src/app/pages/community-info/profile/edit-community/edit-community.component.ts
@@ -82,6 +82,17 @@ import {ClearCacheService} from "../../../../openaireLibrary/services/clear-cach
placeholder="Visibility status for your community's profile."
[options]="statuses" type="select">
+
+
+
`,
@@ -91,9 +102,24 @@ export class EditCommunityComponent {
public communityFb: UntypedFormGroup;
public statuses: Option[] = [
{label: 'Visible', value: 'all'},
+ {label: 'Visible [Public*]', value: 'PUBLIC'},
{label: 'Visible to managers', value: 'manager'},
+ {label: 'Visible to managers [Restricted*]', value: 'RESTRICTED'},
+/*
+ {label: 'Hidden [Private*]', value: 'PRIVATE'},
+*/
{label: 'Hidden', value: 'hidden'}
]
+ public claimOptions: Option[] = [
+ {label: 'Logged in users', value: 'all'},
+ {label: 'Members only', value: 'membersOnly'},
+ {label: 'Managers only', value: 'managersOnly'}
+
+ ]
+ public membershipOptions: Option[] = [
+ {label: 'Anyone can join', value: 'open'},
+ {label: 'By invitation', value: 'byInvitation'}
+ ]
public community: CommunityInfo;
public isNew: boolean;
public properties: EnvProperties = properties
@@ -133,6 +159,8 @@ export class EditCommunityComponent {
shortName: this.fb.control(this.community.shortTitle, Validators.required),
description: this.fb.control(this.community.description),
status: this.fb.control(this.community.status),
+ claim: this.fb.control(this.community.claim),
+ membership: this.fb.control(this.community.membership),
managers: this.fb.control(this.community.managers),
isUpload: this.fb.control(this.community.isUpload),
logoUrl: this.fb.control(this.community.logoUrl)
diff --git a/src/app/pages/content-providers/remove-content-providers.component.ts b/src/app/pages/content-providers/remove-content-providers.component.ts
index 8fce21e..068add6 100644
--- a/src/app/pages/content-providers/remove-content-providers.component.ts
+++ b/src/app/pages/content-providers/remove-content-providers.component.ts
@@ -81,7 +81,8 @@ export class RemoveContentProvidersComponent implements OnInit {
}
public confirmedDeleteContentProvider() {
- this.subscriptions.push(this._manageCommunityContentProvidersService.removeContentProvider(this.properties, this.community.communityId, this.selectedCommunityContentProvider.id).subscribe(
+ console.log(this.selectedCommunityContentProvider)
+ this.subscriptions.push(this._manageCommunityContentProvidersService.removeContentProvider(this.properties, this.community.communityId, this.selectedCommunityContentProvider.openaireId).subscribe(
() => {
let index = this.communityContentProviders.indexOf(this.selectedCommunityContentProvider);
this.communityContentProviders.splice(index, 1);
diff --git a/src/app/pages/projects/add-projects.component.html b/src/app/pages/projects/add-projects.component.html
index e9e6060..c4858e7 100644
--- a/src/app/pages/projects/add-projects.component.html
+++ b/src/app/pages/projects/add-projects.component.html
@@ -94,12 +94,12 @@
+ [externalUrl]="projectUrl" [hasLink]="false">