mirrors/vaultwarden-web
1
0
Fork 0
mirror of https://github.com/dani-garcia/bw_web_builds.git synced 2024-10-31 06:44:47 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #155 from stefan0xC/fix-org-renaming

Browse source 
revert patch to edit org info
This commit is contained in:
Mathijs van Veluw 2024-02-07 22:19:30 +01:00 committed by GitHub
commit 4430ef74ea
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
patches/v2024.1.2.patch
View file

@ -25,35 +25,17 @@ index 83e0e35cf3..9385c4071c 100644
</bit-form-field> </bit-form-field>
<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 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 --- a/apps/web/src/app/admin-console/organizations/settings/account.component.ts
+++ b/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 { @@ -182,6 +182,7 @@ 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 () => { submitCollectionManagement = async () => {
+ return; // flexible collections are not supported by Vaultwarden
// Early exit if self-hosted // Early exit if self-hosted
- if (this.selfHosted) { if (this.selfHosted) {
+ if (!this.selfHosted) {
return; return;
}
diff --git a/apps/web/src/app/app.component.ts b/apps/web/src/app/app.component.ts diff --git a/apps/web/src/app/app.component.ts b/apps/web/src/app/app.component.ts
index 1f7d8cc2f1..5b45fd9b52 100644 index 1f7d8cc2f1..5b45fd9b52 100644
--- a/apps/web/src/app/app.component.ts --- a/apps/web/src/app/app.component.ts