Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

revert patch to edit org info #155

Merged
merged 2 commits into from
Feb 7, 2024
Merged

revert patch to edit org info #155

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f2c4ab
revert patch to edit org info
stefan0xC Feb 4, 2024
a112a03
explicitly disable flexible collections
stefan0xC Feb 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 5 additions & 23 deletions patches/v2024.1.2.patch
View file
Open in desktop
stefan0xC marked this conversation as resolved.
Show resolved Hide resolved
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