mirrors/vaultwarden-web
1
0
Fork 0
mirror of https://github.com/dani-garcia/bw_web_builds.git synced 2024-12-26 04:18:15 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #153 from stefan0xC/revert-my-mistake

Browse source 
revert patch to fix max collection check
This commit is contained in:
Mathijs van Veluw 2024-01-18 09:10:18 +01:00 committed by GitHub
commit eb88710163
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
patches/v2024.1.0.patch
View file

@ -420,7 +420,7 @@ index baff9d1b68..25f99cb40a 100644
</div> </div>
</div> </div>
diff --git a/apps/web/src/app/vault/individual-vault/vault.component.ts b/apps/web/src/app/vault/individual-vault/vault.component.ts diff --git a/apps/web/src/app/vault/individual-vault/vault.component.ts b/apps/web/src/app/vault/individual-vault/vault.component.ts
index 964debb536..12b23f8888 100644 index 5ca857dae6..bc7568f5f4 100644
--- a/apps/web/src/app/vault/individual-vault/vault.component.ts --- a/apps/web/src/app/vault/individual-vault/vault.component.ts
+++ b/apps/web/src/app/vault/individual-vault/vault.component.ts +++ b/apps/web/src/app/vault/individual-vault/vault.component.ts
@@ -188,11 +188,7 @@ export class VaultComponent implements OnInit, OnDestroy { @@ -188,11 +188,7 @@ export class VaultComponent implements OnInit, OnDestroy {
@ -436,19 +436,6 @@ index 964debb536..12b23f8888 100644
const firstSetup$ = this.route.queryParams.pipe( const firstSetup$ = this.route.queryParams.pipe(
first(), first(),
diff --git a/apps/web/src/app/vault/org-vault/vault-header/vault-header.component.ts b/apps/web/src/app/vault/org-vault/vault-header/vault-header.component.ts
index 9740705ae9..e000d3f10c 100644
--- a/apps/web/src/app/vault/org-vault/vault-header/vault-header.component.ts
+++ b/apps/web/src/app/vault/org-vault/vault-header/vault-header.component.ts
@@ -160,7 +160,7 @@ export class VaultHeaderComponent {
}
async addCollection() {
- if (this.organization.planProductType === ProductType.Free) {
+ if (this.organization.planProductType !== ProductType.Free) {
const collections = await this.collectionAdminService.getAll(this.organization.id);
if (collections.length === this.organization.maxCollections) {
this.showFreeOrgUpgradeDialog();
diff --git a/apps/web/src/app/vault/org-vault/vault.component.ts b/apps/web/src/app/vault/org-vault/vault.component.ts diff --git a/apps/web/src/app/vault/org-vault/vault.component.ts b/apps/web/src/app/vault/org-vault/vault.component.ts
index 4dd05b67c1..e6d9344261 100644 index 4dd05b67c1..e6d9344261 100644
--- a/apps/web/src/app/vault/org-vault/vault.component.ts --- a/apps/web/src/app/vault/org-vault/vault.component.ts