From 3f2c4abbd992ce142bf43c42db8f65c03ea40142 Mon Sep 17 00:00:00 2001 From: Stefan Melmuk Date: Sun, 4 Feb 2024 22:02:08 +0100 Subject: [PATCH 1/2] revert patch to edit org info --- patches/v2024.1.2.patch | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/patches/v2024.1.2.patch b/patches/v2024.1.2.patch index 9c55eb3..86eeaa2 100644 --- a/patches/v2024.1.2.patch +++ b/patches/v2024.1.2.patch @@ -25,26 +25,9 @@ index 83e0e35cf3..9385c4071c 100644 diff --git a/apps/web/src/app/admin-console/organizations/settings/account.component.ts b/apps/web/src/app/admin-console/organizations/settings/account.component.ts -index 10aa1224e2..df3d18e89b 100644 +index 10aa1224e2..d3219be672 100644 --- a/apps/web/src/app/admin-console/organizations/settings/account.component.ts +++ b/apps/web/src/app/admin-console/organizations/settings/account.component.ts -@@ -120,14 +120,14 @@ export class AccountComponent { - this.canUseApi = organization.useApi; - - // Update disabled states - reactive forms prefers not using disabled attribute -- if (!this.selfHosted) { -+ if (this.selfHosted) { - this.formGroup.get("orgName").enable(); - this.formGroup.get("businessName").enable(); - this.collectionManagementFormGroup.get("limitCollectionCreationDeletion").enable(); - this.collectionManagementFormGroup.get("allowAdminAccessToAllCollectionItems").enable(); - } - -- if (!this.selfHosted && this.canEditSubscription) { -+ if (this.selfHosted && this.canEditSubscription) { - this.formGroup.get("billingEmail").enable(); - } - @@ -183,7 +183,7 @@ export class AccountComponent { submitCollectionManagement = async () => { From a112a0389a636a952649514d11a9cff9253ffd41 Mon Sep 17 00:00:00 2001 From: Stefan Melmuk Date: Mon, 5 Feb 2024 21:15:56 +0100 Subject: [PATCH 2/2] explicitly disable flexible collections Co-authored-by: BlackDex --- patches/v2024.1.2.patch | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/patches/v2024.1.2.patch b/patches/v2024.1.2.patch index 86eeaa2..ef4de6a 100644 --- a/patches/v2024.1.2.patch +++ b/patches/v2024.1.2.patch @@ -25,18 +25,17 @@ index 83e0e35cf3..9385c4071c 100644 diff --git a/apps/web/src/app/admin-console/organizations/settings/account.component.ts b/apps/web/src/app/admin-console/organizations/settings/account.component.ts -index 10aa1224e2..d3219be672 100644 +index 10aa1224e2..3b6f3a702a 100644 --- a/apps/web/src/app/admin-console/organizations/settings/account.component.ts +++ b/apps/web/src/app/admin-console/organizations/settings/account.component.ts -@@ -183,7 +183,7 @@ export class AccountComponent { +@@ -182,6 +182,7 @@ export class AccountComponent { + }; submitCollectionManagement = async () => { ++ return; // flexible collections are not supported by Vaultwarden // Early exit if self-hosted -- if (this.selfHosted) { -+ if (!this.selfHosted) { + if (this.selfHosted) { return; - } - diff --git a/apps/web/src/app/app.component.ts b/apps/web/src/app/app.component.ts index 1f7d8cc2f1..5b45fd9b52 100644 --- a/apps/web/src/app/app.component.ts