Skip to content

Commit

Permalink
Merge pull request #155 from stefan0xC/fix-org-renaming
Browse files Browse the repository at this point in the history
revert patch to edit org info
  • Loading branch information
BlackDex authored Feb 7, 2024
2 parents facc750 + a112a03 commit 4430ef7
Showing 1 changed file with 5 additions and 23 deletions.
28 changes: 5 additions & 23 deletions patches/v2024.1.2.patch
Original file line number Diff line number Diff line change
Expand Up @@ -25,35 +25,17 @@ index 83e0e35cf3..9385c4071c 100644
</bit-form-field>
<bit-form-field>
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..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
@@ -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 {
@@ -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
Expand Down

0 comments on commit 4430ef7

Please sign in to comment.